am 6bd17c9a: DO NOT MERGE CTS version is now 6.0_r1

* commit '6bd17c9a622bf6e2486b39dd79aa6bd90a0d74f3':
  DO NOT MERGE CTS version is now 6.0_r1