Snap for 11520864 from b6d9e11ad32a1525d884ef2b977995d92b9bc301 to 24Q2-release

Change-Id: I683731be55df1c8c9fa55886350b1ec72d83f716