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