Snap for 11944020 from a1cc0ff88436a91bce8da2adfb866377c2a9bfb4 to 24Q3-release

Change-Id: I7a36efe57d55e1412274519d9196a563b6b1d6ff