https://github.com/michaelrj-google approved this pull request. LGTM once the merge conflicts are resolved. For the other changes it'd be best to do those in a separate PR. https://github.com/llvm/llvm-project/pull/185339