Merge "dumpstate: handle errors gracefully" am: e953b04799 am: 607ca6029e
am: 995d353cbe

Change-Id: I8c99b22d070227541f2e5ba535ec7f35689c96fd