Re-apply the change after it was reverted to do conflicts due to another change being reverted. llvm-svn: 204306