Snap for 12695596 from 23152da78ce84b008fa6c0e188057a1ec75920a0 to 25Q1-release

Change-Id: I63d0b05ab7eab10921cd96af0487a4284af86d80