Snap for 10917888 from 12538cc36334c528eb88c93e6c5aab3be2537bcd to 24Q1-release

Change-Id: I2ee7027dc06e762790a4a79145733e91ef468015