Merge "More diagnostics for flaky oat file assistant test."