Snap for 12658558 from 74601d88dc891bc0f61252a2e48005b47d5ccb49 to 25Q1-release

Change-Id: I2898ccbec5689ff3a4fb944272c8c208da42a985