am 4799e0d9: am aea6888b: Merge "Tidy up logging."

* commit '4799e0d90003b3ac60e204fc254a97fbf0104bd1':
  Tidy up logging.