[automerger skipped] Merge "Add logs for debugging flaky test" into rvc-dev...
[automerger skipped] Merge "Add logs for debugging flaky test" into rvc-dev am: 33285aff am: 2f72c79a am: 546be8b4 -s ours
am skip reason: Change-Id I84234ba7cebe793c3bb1d0aab2739b22f5c7d11c with SHA-1 6cadb9bb is in history
Change-Id: I7ba3e57f46a7479b70e8632da6d0e1ea86065070