Snap for 12406339 from 90603d222173f10cd7cfc67b652ae4554d0f7b97 to 24Q4-release

Change-Id: I17e05e3275045e3711945dc561a6b4ed0a1d5b1f