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