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