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