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

* commit '6e8455d65cfa3b107edd41ffd25941cc6ff5e5a5':
  initial mako-specific dumpstate