Merge pull request #3499 from slowy07:fixing

PiperOrigin-RevId: 386888057