Snap for 12722466 from 08fdf6a856147f05569353d1f7aa0bb3029a2484 to 25Q1-release

Change-Id: I74f547824efa7b39635fb82134aa6ce9c0b8b74c