Merge "Fix protos build" into main