Snap for 12765415 from a1e73c96f00845b865adc3047aef8de3f8d70c81 to 25Q1-release

Change-Id: I7a9a111f111dedec7515f9d41f78096c658e4848