Snap for 11504324 from 525803fc3e4b95021d06ab877b9fd2bed0204934 to 24Q2-release

Change-Id: I40e3f15f4940c86b7d7535dbc804dd9efcf6d5d8