Snap for 11931036 from f340406b36e3645f3b69c1edae56153ff2d75658 to 24Q3-release

Change-Id: I6ec08bc198574e63816ca8ea967c79d76d87b0c9