llvm

bce1d53f - Resolve remaining cherry-pick conflicts