Merge "Dependencies needed by CTS tests"