Merge "Fix CTS tests failing due to job throttling"