Merge pull request #1490 from google:eustas-patch-1

PiperOrigin-RevId: 924650836