Merge "Logging related comment updates"