Merge "Clean up debug messages" into jb-mr1.1-dev