Snap for 11869550 from 48c5d960bab2bc8ef39c01e08571a7d23d10f22a to 24Q3-release

Change-Id: I04a766d928270565d6005b342c9f91eba64ed0cf