am d1e90c01: Merge "Cleanup base/logging."

* commit 'd1e90c01f6409cd3babd2c38154aebf9272cd825':
  Cleanup base/logging.