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

* commit 'ddb2180aed3ed24e2efe12fea3a56901b6b338de':
  initial mako-specific dumpstate