am 05e9f39e: am fee8a29f: (-s ours) Merge "DO NOT MERGE Bump CTS versions" into jb-dev

* commit '05e9f39e2813a11b4442c89e4dac2954ae4a22b6':
  DO NOT MERGE Bump CTS versions