Backport r58545.
1 file changed