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