Snap for 12085179 from cd2cdcc1a85e8b9a0a7092a5818da375564849d6 to 24Q4-release

Change-Id: Ie596a00e10a2c93fd5845941cf327d576c00255b