Snap for 12632686 from 9015bc2df909c38af91aaa9db0a10d5ae7084609 to 25Q1-release

Change-Id: Ia7edd2a99bc896c3f9b91ce6dd716526769e6624