Backport of r52238
1 file changed