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