Android 7.1.2 Release 6 (NHG47K)
merge in nyc-mr2-release history after reset to nyc-mr2-dev