Snap for 12496712 from 013069b4781ce6a91e69aed75587e01c2250aded to 25Q1-release

Change-Id: Id1a1c7cbc0ea5994ce9b08f30aa1dd129ade4f3e