am bf449983: (-s ours) am e1c3a7c1: am 45288223: Merge "libbase: logging fixes"

* commit 'bf449983ce68a8eaa0c54ceac801edb32277a43c':