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

* commit 'a47d32c67209d43ad3ceac91dfcb4d4a15ec6185':
  Cleanup base/logging.