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