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