Merge "dumpstate: Improve error message for failed dumps."