[Release-2.70] Cherry-pick #36995 and #37003 - #37016

Failed to save cache entry with path '/home/runner/.gradle/caches,/home/runner/.gradle/notifications,/home/runner/.gradle/.gradle-build-action,zstd-without-long,1.0' and key: v8-gradle|Linux|precommit python runners-beam_PreCommit_Python_Runners[dd68cd4d3a044437bb5387003fabd12b]-8ff2c940321cc8adb49e2fc590a1d35fd7113add: Error: <h2>Our services aren't available right now</h2><p>We're working to restore all services as soon as possible. Please check back soon.</p>0SlszaQAAAAAlsngE3WhRTadND1HmNUQgQ0hJMzBFREdFMDIxMgBFZGdl

Failed to save cache entry with path '/home/runner/.gradle/caches/modules-*/files-*/*/*/*/*,zstd-without-long,1.0' and key: dependencies-373336718fa0ccae606728a97b74e006: Error: <h2>Our services aren't available right now</h2><p>We're working to restore all services as soon as possible. Please check back soon.</p>0SVszaQAAAAAjr0F0fPfrT49gQv2t4CwEQ0hJMzBFREdFMDIxMgBFZGdl

Failed to save cache entry with path '/home/runner/.gradle/caches/*/kotlin-dsl/*/*,zstd-without-long,1.0' and key: kotlin-dsl-2c60dc2568b9a3a073c14eed97c749b2: Error: <h2>Our services aren't available right now</h2><p>We're working to restore all services as soon as possible. Please check back soon.</p>0SVszaQAAAADbpJa3GmZLQq4yNBbQHTbRQ0hJMzBFREdFMDIxMgBFZGdl

Failed to save cache entry with path '/home/runner/.gradle/caches/jars-*/*,zstd-without-long,1.0' and key: instrumented-jars-a382f3f26454b703092c484fe25f9a89: Error: <h2>Our services aren't available right now</h2><p>We're working to restore all services as soon as possible. Please check back soon.</p>0SVszaQAAAADe435UFYNFSIVLo/Msqvc9Q0hJMzBFREdFMDIxMgBFZGdl

Failed to save cache entry with path '/home/runner/.gradle/wrapper/dists/gradle-8.14.3-bin/cv11ve7ro1n3o1j4so8xd9n66,zstd-without-long,1.0' and key: wrapper-zips-5ae5d3da5e8e0c748d04bcdd9bc97bdb: Error: <h2>Our services aren't available right now</h2><p>We're working to restore all services as soon as possible. Please check back soon.</p>0SFszaQAAAAAKiJsxwgygQakkO0ABbu7IQ0hJMzBFREdFMDIxMgBFZGdl

Failed to save cache entry with path '/home/runner/.gradle/caches/8.14.3/generated-gradle-jars/gradle-api-8.14.3.jar,zstd-without-long,1.0' and key: generated-gradle-jars-4434c59050703a48bf14168622b59891: Error: <h2>Our services aren't available right now</h2><p>We're working to restore all services as soon as possible. Please check back soon.</p>0SFszaQAAAAB1FuLaE6B5TI66XIImAvF9Q0hJMzBFREdFMDEwNgBFZGdl