Merge "Fix broken ProtoLogIntegrationTest"