Merge change 9052

* changes:
  Less log spew.