Android 7.1.1 release 4
merge in nyc-mr1-release history after reset to nyc-mr1-dev