Merge "Remove CTS tests for removed API"