Merge "Add logging to CTS test to trace flaky behavior in CI"