Snap for 11869550 from d1e717d26cf64be4d2e1e564d98e0b3b9a6faad8 to 24Q3-release

Change-Id: Id8ebbc4784ea0fcb8a93a6d04652e195a70794db