Merge r1794114 to the 1.7 branch.
2 files changed