Snap for 11869550 from 939b8ccb82817ceb1ffd42ef84b850406f0f5940 to 24Q3-release

Change-Id: I51558c6cb2befb13d9baa45b10a718627c88b339