Merge "Add support for proto dumps in dumpstate"