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

Change-Id: Ie6c748a7bf5d9a2a259a7b9b344347ed3657f4e8