Snap for 12763142 from 744c115789fb9abbbc48c423e56b85656bc69ad3 to 25Q1-release

Change-Id: Ia193f605128dc2ed44664fb8c8ab030bbe3a92c9