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

* commit 'fa5a6affffb0efe6c41ea44499b0e9b619bee161':
  Clean up debug messages