Clean up ownership in cts

Bug: 197217250
Change-Id: Ia8b24b3c993637c3a73213bbc820c1a231b7a06f
Merged-In: Ia8b24b3c993637c3a73213bbc820c1a231b7a06f
Test: No code changes done.
5 files changed