Snap for 11938003 from d9cb45d1326c2eb481845e39b097ede1f25bf768 to 24Q3-release

Change-Id: I217d6ad577d261c50e7ade51cc3f69e5dcd8cb3f