DO NOT MERGE CTS version is now 6.0_r1.5

Change-Id: Ifc77b722ba16368648e952606103d60de1adb611
2 files changed