Merge "Switch to CTSv2" into nyc-dev
am: 7c4a698a0b

* commit '7c4a698a0b45674fa8a83d497e982e537915a31a':
  Switch to CTSv2
tree: 09ddba891766b0229baf6249e2a4568fd5fc53e7
  1. tests/