Merge r1815035 to the 1.7 branch.
1 file changed