Snap for 12439515 from 4f0fd464cae3088d4256a0f14acb80694ffd2e23 to 25Q1-release

Change-Id: I2174f618fe07df18a805bf115ef88c49664e0e3c