Changes for upmerge 2025.04.23 #2242

Job	Run time
Unit / Integration Tests (main)	15m 35s
Unit / Integration Tests (clang)	17m 6s
Unit / Integration Tests (mbedtls)	15m 37s
Unit / Integration Tests (rotating_device_id)	17m 34s
Unit / Integration Tests (icd)	45m 4s
	1h 50m 56s

Provide feedback