Snap for 12199973 from a12456e09b70ca096a12d2dfe10a4300c2a57c8a to 24Q4-release

Change-Id: Idc51d4d57f52bbc7d50f2b110642274f446bbff2