Snap for 12722466 from ec19ec417509af1ceae3794f15efea39655a5917 to 25Q1-release

Change-Id: I7f1493e18a73759400f97bdc190bf019cd0f9fe7