Snap for 12742097 from cab10406ac0bf318dbe127f268adcce517e8ac83 to 25Q1-release

Change-Id: Iee68de03fea12f616fdab1aa8ee395d7b20bf31c