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

* commit '67b1761534d7e2518830cfb3d2c28271ffe56a26':
  Clean up debug messages