https://github.com/AaronBallman approved this pull request. LGTM, let's pay attention to fall-out from the changes though, particularly once the release candidate goes out in a week or two. Hopefully it's not too disruptive! https://github.com/llvm/llvm-project/pull/206123