Merge change I36117487

* changes:
  Tidy up Logger in preparation for optimizations.