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

PiperOrigin-RevId: 397858053