Snap for 12673321 from fc556bccc1bd436e436661c416c319e8f30a683e to 25Q1-release

Change-Id: Ib6e5451c6978d1e1e193d1ff7651a2d77093e65f