Android 7.0.0 Release 32 (NBD92F)
merge in nyc-bugfix-release history after reset to ee75066be8aa3a3a1f0f9bfb10bcf72c91f22aa3