Snap for 12224018 from 297812c61f18c1dcecbb9bb7a4e115eac1fa5159 to 24Q4-release

Change-Id: I4653de60d979042accbf4840bca94c483dc94a59