Android CTS 7.0 Release 6 (3670477)
merge in nyc-release history after reset to master