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