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