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