Snap for 11491255 from 53c8336ad13db87f6901cc4aedf406a7be5ceb8f to 24Q2-release

Change-Id: I331cb96c770dedc5999d6a5a9df5af96e6c92f68