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

* commit '4fd38e8d13697cd1b169487719982f32cc5fb425':
  Clean up debug messages