Snap for 11889377 from 5774d5799f82680e2f9bf7b77475e52491a2811d to 24Q3-release

Change-Id: I335bfb07b2568b7fcb5b566fc52dd46cb6ff05e1