Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4

Googletest export