Backport of r52229
1 file changed