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