Merging r196612:
------------------------------------------------------------------------


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