Snap for 12658558 from d2569f54bb570091e5cc01aa839fd3de9f6b5d3b to 25Q1-release

Change-Id: Ic22232c40bc035a5880c7b438d4904c3b19e7c90