Merge pull request #1070 from kloczek:master

PiperOrigin-RevId: 563753673