Snap for 12587146 from 9ea4d194516179402e5a53f11fce30b4de511cff to 25Q1-release

Change-Id: Icc911c794cea68a6daee4affecf329433db122bc