Snap for 11954976 from e0f1bd614187aac5395b9112219c558138c03a8e to 24Q3-release

Change-Id: If358d323069c7f19adca64c800c077479d8daae3