Merge "Add proto dumpstate mode"