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

* commit '98874efb994faca3bf253e9547cbb6227d44eb38':
  Debug logging improvement.