Snap for 12748980 from fb20335a7ac449823dbdeadabd367b38bfd077db to 25Q1-release

Change-Id: I2629625b2e40f79212025ceb7eba1793880d37b6