Snap for 12765415 from 70e0a67de3892ca547a03766a726f6ab3a50e804 to 25Q1-release

Change-Id: I5dd66147ca573c11d87b9654952f985420c12833