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