Merge "DO NOT MERGE CTS version is now 6.0_r1.5" into mnc-dev