Merge "dumpstate: handle errors gracefully"
am: e953b04799

Change-Id: I6d55aa42a196ac53883057800596b0d065ce605c