Snap for 11949167 from 057ae1223faa73f3590d103b107c6e49aa8cc213 to 24Q3-release

Change-Id: I25026b88ba4b518b8f71072a68b89f1680a8ad05