Merge "Add ion debug info to dumpstate" into jb-mr1-dev