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