Merge "Fix the testDumpOutput presubmit test" into main