am a53cf1de: Merge "initial mako-specific dumpstate" into jb-mr1-dev

* commit 'a53cf1de627492eed62dbceff6b837e5dfb43bdd':
  initial mako-specific dumpstate