Snap for 11881322 from 7549ad48033026de57dcab492516f71467d00c57 to 24Q3-release

Change-Id: I63fd3bf1ec2eab622c83acbc1b5319c1f0a482ad