Merge "Update package ProtoLog is imported from in tests" into main