Snap for 12205827 from 8c4aa1b681d7c2a9d69b11f1111b0352a915d252 to 24Q4-release

Change-Id: Idc886060cd628436e5979d9badca3620e7f0f518