Merge "dumpstate: format readme" am: 0119e28e9e am: 406ad255bf
am: 65fa417553

Change-Id: I870e080ab97847b63c7f1e38ca6f5ffb21fe2362