Merge pull request #3486 from ScottTodd:main-to-google

PiperOrigin-RevId: 337331640