Snap for 12217053 from 9d6f4bf2c11313d0d5c35a4144fb1612fdbe642b to 24Q4-release

Change-Id: I11c4cf44358f82f5debd6db1f519025484dfbf51