Snap for 12710726 from c052205525fb31ca68fbb0a3803c690870b8d62c to 25Q1-release

Change-Id: I9621282a4bd16822b81e4be8665134a87c90e032