Merge "Remove legacy proto helper functions" into main