Ready to be approved but not merged yet (fyi @sgowroji)

Closes #17768.

PiperOrigin-RevId: 516795838
Change-Id: Ifeb57fa95e9c67d4441e7a0701a6446eb4dc7cc5