Android 7.1.0 release 3
merge in nyc-dr1-release history after reset to nyc-mr1-dev