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