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

PiperOrigin-RevId: 372598502