am d8da9dc8: Merge "More diagnostics for flaky oat file assistant test."

* commit 'd8da9dc897ececb8df8cafd458b48fa65a703acc':
  More diagnostics for flaky oat file assistant test.