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