Merge from mainline.

llvm-svn: 51906
1 file changed