Snap for 11491255 from d423e1ce7a77a2223ac0a6921b9420ed9c2cd0a0 to 24Q2-release

Change-Id: I51f2b0565aa8b29727c58e28810927ce6ac74f33