The previous commit missed out some recent changes in the internal repo. This commit brings the public GitHub repo in sync. PiperOrigin-RevId: 450377010 Change-Id: I59a68ae4a39c5cd5ed5f7df77ba870273243d623
PiperOrigin-RevId: 450374687 Change-Id: Ie3225a46ce095fc28ae8e63c326a640261f562bb