Snap for 12580585 from 6877c0c71333ec9c7b3d0acce811dbc1478517da to 25Q1-release

Change-Id: I4e6e95f2ceffa4a061e356e9e00cc17ebc4f00e0