Snap for 11486370 from a37ccfef0d305494fe4c7247d58aca687d24359d to 24Q2-release

Change-Id: Ic868e0b05a35294fa2159aa3218b2a2e68c0e915