Snap for 11828632 from 696554c816dd373f5ece47d994419e17c553f7c8 to 24Q3-release

Change-Id: I10102d189abf1bb9db8a7f0d313d4aee4767aadd