Merge "libbase: logging fixes"