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

* commit 'b8e80eb566aa5afb744db84a0067e144de831f45':
  Clean up debug messages