Merge "Fix build breakage due to broken CTS dependencies."