am f4734b4b: am 1de1767e: am a3af85c2: am 6bd17c9a: DO NOT MERGE CTS version is now 6.0_r1

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