Android CTS 6.0 Release 4
merge in mnc-release history after reset to mnc-dev