Merging r214208:


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_35@214257 91177308-0d34-0410-b5e6-96231b3b80d8
Merging r213993,213998:


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