Merge "Fix dumpstate tests"