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