Merge pull request #2290 from gennadiycivil:master

PiperOrigin-RevId: 253660961