[automerger skipped] Merge "Add proto dumpstate mode" am: 294cfe01 am:...
[automerger skipped] Merge "Add proto dumpstate mode" am: 294cfe01 am: 08e6bd39 am: b2f9b665 -s ours
am skip reason: Change-Id I1d586c99b654471db5028039792c3d9e6e2184bb with SHA-1 8908d6fd is in history
Change-Id: Id97914694423a98062f267658c9eaad7c50e46df