Snap for 11949167 from e4ee6001f48a7e754b34dd95ab2fff210849e7c9 to 24Q3-release

Change-Id: Ice3d2784560553c67a5086d854199ce8c55619d1