Merge "Fix dumpstate smoke test"