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

* commit '6f7d88cdf5f7cba79f06837bf6b9553faac9331c':
  DO NOT MERGE CTS version is now 6.0_r1.5