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

PiperOrigin-RevId: 417694341