Merge "Fix build error when verbose logging is enabled"