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