Android 7.1.1 Release 47 (N4F27K)
merge in nyc-mr1-release history after reset to nyc-mr1-dev