Snap for 12974810 from e170f38daf0cd89e1c929a23b5f499eeda29bd42 to 25Q2-release

Change-Id: I2ef2805e898b3b1013c9454d665543c09ed0068d