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