Cherry-pick r317444 to google/testing.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/google/testing@317857 91177308-0d34-0410-b5e6-96231b3b80d8
3 files changed