Snap for 11869550 from 197618c5e7e0287417ba47d019e55c39e44633b3 to 24Q3-release

Change-Id: I600a163b477159e0bb39833dcacab6885cbffa52