Merge "add logs to investigate flakey test"