Merge r1735801 to the 1.7 branch.
1 file changed