chore: Cherry pick fixes for update of default branch to main #28274

All 182 tests pass in 37m 31s

116 files ±0 116 suites ±0 37m 31s ⏱️ + 1m 17s
182 tests ±0 182 ✅ ±0 0 💤 ±0 0 ❌ ±0
1 073 runs ±0 1 073 ✅ ±0 0 💤 ±0 0 ❌ ±0

Results for commit a5d36a8. ± Comparison against earlier commit 0757288.