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