am 3ff23e24: Merge "Improve logging."

* commit '3ff23e2461de5a5aae4343147486df84e8a77d90':
  Improve logging.