Snap for 12594757 from bc61bb4cc134a2126078a71a8567e1a213f4430e to 25Q1-release

Change-Id: I537a6560297e2b5c2dd3e5cd8fa29560e3165cff