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