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