Android CTS 7.1 Release 15 (4607299)
merge in nyc-mr1-release history after reset to nyc-mr1-dev