Snap for 12551711 from 6232e90c629557ac5639a3adf1fe879f67425d0d to 25Q1-release

Change-Id: I10c911d8f0deb8bca3608bab0316a4d38aabb060