am f80d4607: am 8b667359: am 3ff23e24: Merge "Improve logging."

* commit 'f80d4607e835c17b85c4a09e239ff8fddf3d938b':
  Improve logging.