Fix broken merge (#24341)

Release Notes:

- N/A
10b6bc2508Mikayla Maki committed on 2/6/2025, 2:21:42 AM· committed by GitHubparent4270f89
1 file changedLine totals unavailable