Snap for 13219462 from fedaddb9bd975308f1300da77b6d2c5eb63af4d3 to 25Q2-release

Change-Id: I636f918d30ef1bbba3f01ab916d2195178f48f44