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