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