Snap for 11078623 from ffa6d21a740ff49f65a45b68eb2ef46ca656ff64 to 24Q1-release

Change-Id: I63ca81d3d0be04eba1edc82a81f72a9149d91865