Merge "Add proto dumpstate mode" am: 294cfe01fc

Change-Id: I09c95e155720dfb17efd74cc1206073abe6dc3f6