Updating branches/google/stable to r220284

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/google/stable@223294 91177308-0d34-0410-b5e6-96231b3b80d8