Android 7.0.0 Release 34 (NBD92N)
merge in nyc-release history after reset to nyc-dev