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