Snap for 12763142 from 8f92685ba9d3d4fb83177b4f9e94d03f879d4d43 to 25Q1-release

Change-Id: I2b72cf4a3b8f9334e35df33c7355d16d0fb45dd5