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

Change-Id: Ifff97c4c2434d6f75fd7bd4ccdaa595c46c7c95c