Merge "dumpstate: Improve error message for failed dumps." am: 8f3776a7ac
am: 363e272899

Change-Id: Ica9d2958a0972be92a317ccaf8a6d84f3e198cb3