Merge "Fixes presubmit test flaky in dumpstate"