Snap for 12543847 from 70d1a721dee8571f6b9d442ce0e1fb8774f75e65 to 25Q1-release

Change-Id: I4080dafd592765a535aab8370af959052ff57e2c