Snap for 12361654 from 05bd76040ea5e3afbe2db7f7f62a543ec6f7eeaa to 24Q4-release

Change-Id: If87805dea4a5266c518c55a1e80f876022ca3415