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