Android CTS 7.0 Release 12 (4215243)
merge in nyc-release history after reset to master