Snap for 11860797 from ddc47913e639977f738d24409b8a79deb89b4748 to 24Q3-release

Change-Id: I85b6a1059a92a41d184343c7984b38146f83aca0