Merge change I88e8376e

* changes:
  Update logging to r820767