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