Snap for 13256841 from e54380ff24721fbadc1017e6a3bfef4e1c28f335 to 25Q2-release

Change-Id: I6915facf9858f9cca6c42b2d49f6beed992ce2c7