https://github.com/michaelrj-google approved this pull request. LGTM, I'll comment when I've merged the previous PRs so you can resolve the merge conflicts and then I will merge this PR. https://github.com/llvm/llvm-project/pull/185574