Snap for 12526387 from aaf1bf5465277b414529ce4326a7bbf3cf121600 to 25Q1-release

Change-Id: Id8df3d15403d576ae1ea2c101ef28a6d8f22d569