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