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