Merge "logging: avoid unnecessary printfs"