am cc979c9e: Merge "Debug logging improvement." into jb-mr2-dev

* commit 'cc979c9eae387d80e4c4129d18991d708dde44a6':
  Debug logging improvement.