am 0a72d65a: am 56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant test."

* commit '0a72d65ab483085c6de22bf76176873cddd5a30f':
  Add more checks to diagnose flaky oat file assistant test.