Snap for 11666018 from b97ca11866df8157d18b32420846ecca13d906ed to 24Q3-release

Change-Id: Ic6573f14ca9f681b640d22439de4d9f316adcf0e