Backport r58542.
1 file changed