Changes for upmerge 2025.04.23 #2240

Job	Run time
Unit / Integration Tests (main)	2m 33s
Unit / Integration Tests (clang)	2m 35s
Unit / Integration Tests (mbedtls)	2m 32s
Unit / Integration Tests (rotating_device_id)	2m 34s
Unit / Integration Tests (icd)	2m 34s
	12m 48s

Provide feedback