Snap for 11822896 from 757957f94b6a2902b02f166c7620fe906b8749a0 to 24Q3-release

Change-Id: Ie59556975cabc0d6be546ce90610baeb36f6d875