Snap for 11386701 from fc2392eabe465e0a5e5c0f2630f0b153937d1486 to 24Q2-release

Change-Id: If553eb33d2c948a28a8632cd4c4e03a8e8abac44