Snap for 11975806 from 7c04ddd07ae6e79bf21a33142fed034b48cc7b84 to 24Q3-release

Change-Id: Ie18b2d218fa49b8c3a4ba8b6f39c5d8d7ba71394