Merge pull request #3400 from GMNGeoffrey:main-to-google

PiperOrigin-RevId: 336087048