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

Change-Id: I54463c8a6f238eff4a4b713c510c372c85396cd5