Snap for 11704135 from c5bde7b2c18b858df350ee17ea52711f628be74a to 24Q3-release

Change-Id: Ic3ec8a7d1aea6bd474f017f0db5705c10553b969