Snap for 12551711 from 496b1c29c1a5bbf4edf24380bd551e92cb035122 to 25Q1-release

Change-Id: Ib919b9bb0fa0a14219f434fe2d1b2a87d914c628