Snap for 12404440 from 8e7761045a53e187e31d5c2d7ef7b929d6523b36 to 24Q4-release

Change-Id: I3146818884913fb95ce885fb1e26343dd587f4c1