Snap for 12378824 from b3f851ff36ca3686e3beffe55fbcbfe667683176 to 24Q4-release

Change-Id: I0d79f5833baabfecaa217dbb91a55f9565d52f44