Snap for 11959661 from 8f2a4e0854560d8e253ac7065a8622604f572586 to 24Q3-release

Change-Id: I750873cb534e9e20aea871a8cda9a37da12315e6