Merge "Add proto dumpstate mode" am: 294cfe01fc am: 08e6bd392c

Change-Id: Ic82141a60048b14e41c00f00694cf0a1bf63218d