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