am 3b5c4382: am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev

* commit '3b5c43825eaf8096c01eac77e03a8aac8e9fab4a':
  Clean up debug messages