am aea6888b: Merge "Tidy up logging."

* commit 'aea6888b056be21adf762e066c7f33b8939b8a06':
  Tidy up logging.