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