Snap for 12687986 from ed9baaaf42898ff8e07b6f62afdbbf3c07517944 to 25Q1-release

Change-Id: I394a8deb9bbc10a59b5afb0a56f1295553d17bde