Merge change 7791

* changes:
  Remove unused logging code.