Merge "Fix dumpstate_test test config"