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

* commit '8b667359a066db11d303ce727015e596f29f04a0':
  Improve logging.