Snap for 12296955 from 14454173e6ccb9c3a1b79835ff50ec8a75bc246a to 24Q4-release

Change-Id: I1fbce190dc8935fd13a6c007fb9f6eb32ab7c3e5