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

* commit '56ebee4d2b94bcf4040f49eddaa35ad7e43cc53d':
  Add more checks to diagnose flaky oat file assistant test.