Snap for 10843824 from d6243ce159f96ac2b5e7e48fa0ad38814845bf41 to 24Q1-release

Change-Id: I43c922c2e977092600479e5f0aece0ec129198aa