Android CTS 7.0 Release 10 (4012877)
merge in nyc-release history after reset to nyc-dev