Snap for 11220357 from 6646316362082eebde42e4b69ee53e6e98017d9b to 24Q1-release

Change-Id: I0dd841ee6104e591ed87796c4d089a89010de78a