Merge "Add logs for debugging flaky test" into rvc-dev