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