Snap for 10878163 from 31b982ce55727bc4bdb98db01d0e4d1666cf6edb to 24Q1-release

Change-Id: I70029c1ac1f43b3fc3ee0cfbd6b7b391c72984b5