Manually fastforward platform/cts.

platform/cts shoves too many changes at one into automerger and it slows everyone else down. Manually merging everything in platform/cts that needs to be merged to unblock other things.
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/