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