Merge "Resolve merge conflicts for BubbleLoggerImpl"