Android 7.0.0 release 31
merge in nyc-bugfix-release history after reset to 84c19a31b932085dd5ba0bff4b535e6188edef9e