Snap for 11881322 from 6679edd1cfc3abd275e76d1b9c29446f5c569404 to 24Q3-release

Change-Id: I5d8369b507235cfe69a18165e91cbd8ae283e8e8