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