am 68c384fd: am d1e90c01: Merge "Cleanup base/logging."

* commit '68c384fd4f4cd2185d46bd762b81fbbe0b82a0c1':
  Cleanup base/logging.