Snap for 12368321 from cabb4bf750be1771d17567eedf4dfb68f1c01cc2 to 24Q4-release

Change-Id: Ie3647fd7614d4f3239020a32787f202f34c870e4