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