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