Merge "Add logging for flaky tests"