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