Snap for 11881322 from ffb0f4dbc3c6b849c063f6e9a1440997682465a4 to 24Q3-release

Change-Id: I7e029f2bf56fcfc4b9213b8dd59574a027757b18