Snap for 11881322 from c1507907be101919ff759471de639aed21573f29 to 24Q3-release

Change-Id: I84f2f4e6c0a407c2890362586b2e2c37c73c84cb