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