Merge pull request #25767 from tiborvass/1.12.1-rc2-cherrypicks

1.12.1 rc2 cherrypicks