Snap for 11479893 from f72f9a9f3debb42042b9ec486be1ed81150370a7 to 24Q2-release

Change-Id: I16c02305d753de3ded50497c7bd281b55f62dfde