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

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