Snap for 12770256 from 682494ec7038110b152c9eaed4c2f587fe00b1da to 25Q2-release

Change-Id: I5ce2c6bfa6f72b0b11005f65d6eb48d14fdd12ce