am 45288223: Merge "libbase: logging fixes"

* commit '45288223d0ce864b84aa2d3e0321c0276c136ae1':
  libbase: logging fixes