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