Snap for 12406339 from d2bc2c7d1f4a877d6bc3f7aab348abd4378e98b3 to 24Q4-release

Change-Id: I9084e263f18cae9105acbf8360eb6ec8a2ea6d96