Android CTS 6.0 Release 7 (2906653)
merge in mnc-release history after reset to mnc-dev