Snap for 11828632 from fa63eb562ebf42b6cc13f322adcfd96e97cf23a3 to 24Q3-release

Change-Id: I5d0d62d71147897f9775c5c945396b286d0e787d