Merge "Fix the build when logging is enabled."