Merge "Dropping CTS v1 targets"