Snap for 11635697 from 6b6c189820587a2a8f844045268093227f7e06ba to 24Q3-release

Change-Id: Ifedb19014147bb69e91a19d9ac3bf12b312e7605