Snap for 12199973 from 800a9168b03cf83b38b1c90dbcd93b8f57a7e720 to 24Q4-release

Change-Id: I6c43da6b10c8c9241d783d60cad06cb4705db2d6