Snap for 11834877 from daafff2d85bc7d7d5a2fa743f4005c900b902410 to 24Q3-release

Change-Id: I59759d3273897905ef0a9c7802667b5748445bed