Snap for 12078078 from 6a11d1a9da2c7c69862b3f985e81f12ddd8d05d7 to 24Q4-release

Change-Id: I1e8ebdf6e007279ed5b5b8cb9df27747ca553ae3