One more attempt to Fix incorrect merge during cherry-picking r281813 in c99c50418
One more attempt to Fix incorrect merge during cherry-picking r281813 in c99c50418

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