Merge "Fix Proto compilation on M1 Macs" into tm-dev