Work towards #23497
Work towards #24389

Closes #24431.

PiperOrigin-RevId: 698846634
Change-Id: I3fb2d46597b225833a918af9731665bb276322dd