Snap for 12508860 from abf6ee7f456e7254548cf7a7cff78b01623dc5fd to 25Q1-release

Change-Id: Idfef97d0f928f240deab08b1a941c0649eb9a1a1