Merge upstream llvm.org r210196 into dev-tfiala-native-protocol-linux-x86_64
Merge llgs branch into local changes.