Merge "Minor changes on dumpstate refactoring:"