Snap for 11206181 from 0b4aa3dae59b39498d64e2bcb30f2f9d5f675642 to 24Q1-release

Change-Id: Ie648ebc27b9d7cc2770215fbace6996db530eec3