Snap for 12763142 from 0c750a8d6c755969faede8450a6ff162d62ad528 to 25Q1-release

Change-Id: Ifa01fcbd1cf203efd2b8f5122032f59a6c3a3505