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