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