Snap for 11830997 from b081899b7dd44f953d4cfe9185d8d34ba87f5d7f to 24Q3-release

Change-Id: I09e6d8c1f5cc1f7ae0d9b23349ab8d9a9d08ad7b