Merge "initial mako-specific dumpstate" into jb-mr1-dev