Merge "Fix issues with slow CallDiagnosticService CTS tests." into sc-dev