am ad436ab5: Merge "dumpstate: scrub APANIC"

* commit 'ad436ab54a649075b25ab755344fd011bd0c9262':
  dumpstate: scrub APANIC