bd1de32b33
This commit addresses the review feedback from #32052, which was merged before addressing the feedback there. PR Close #32427