Snap for 12763142 from d41b7cb3506abed96b4a6e62b143309ed1dc95b9 to 25Q1-release

Change-Id: Ib41e9ec2c3662e5d1892ec79c9934c7625218c38