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

Change-Id: I26a9a9e9eeecea74dfb0590427a63ae0a9096455