Snap for 12391343 from f4bbe5bf8efebd555425ccabb6c64e9140a5fa42 to 24Q4-release

Change-Id: I79e89e34bb3d27fd2162ed7af5dc84a9a8e1d8ed