Propagating prior merge from 'llvm.org/master'.
Propagating prior merge from 'llvm.org/master'.

apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm,apple/swift-llvm