Merge "Fixes dumpstate_smoke_test failed"