Snap for 12199973 from 13be76abda0c886dabd340b8c9973ad0b1d8b75f to 24Q4-release

Change-Id: I30c8ee25300ed16faae66e2a5366b6cbf1a1e7da