Snap for 12488717 from dafd6aa8d5039eccc7e8eb7b49ec38f519a4d499 to 25Q1-release

Change-Id: I9b7be8e7755b5fb57a1ba1ffe0fe40051a7cf19d