Merge "Remove redundant flag from dumpstate"