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