Cherry-pick 32521 and 32516 [lts 19] #11902

Job	Run time
build	3m 21s
analyze	4s
lint	2m 13s
test	18m 36s
e2e-package-managers (ubuntu-latest, 22, pnpm, 1)	5m 23s
e2e-package-managers (ubuntu-latest, 22, yarn, 2)	7m 25s
e2e-package-managers (ubuntu-latest, 22, pnpm, 2)	6m 16s
e2e-package-managers (ubuntu-latest, 22, yarn, 1)	6m 35s
e2e-package-managers (ubuntu-latest, 22, yarn, 0)	8m 31s
e2e (ubuntu-latest, 22, npm, 3)	11m 5s
e2e-package-managers (ubuntu-latest, 22, pnpm, 0)	6m 27s
e2e (ubuntu-latest, 22, npm, 2)	11m 42s
e2e (ubuntu-latest, 22, npm, 0)	9m 59s
e2e (ubuntu-latest, 22, npm, 4)	8m 48s
e2e (ubuntu-latest, 22, esbuild, 3)	9m 57s
e2e (ubuntu-latest, 22, npm, 5)	10m 41s
e2e (ubuntu-latest, 22, esbuild, 2)	10m 42s
e2e (ubuntu-latest, 22, esbuild, 0)	9m 6s
e2e (ubuntu-latest, 22, esbuild, 1)	11m 14s
e2e (ubuntu-latest, 22, esbuild, 5)	7m 35s
e2e (ubuntu-latest, 22, esbuild, 4)	7m 18s
e2e (ubuntu-latest, 22, npm, 1)	13m 2s
e2e-snapshots	0s
	3h 6m 0s

Provide feedback