am d029e95a: am 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"

* commit 'd029e95a58ea0927ebd3431d9991cd316e568002':
  dumpstate: scrub APANIC