Snap for 12765415 from 6c0260c0ec0bff222d3002b8f07933b310bf8137 to 25Q1-release

Change-Id: Ia2d341cf854f697972a42750620a6cc18b7648eb