Snap for 12561555 from 7f62b849cf8232575d2443eda4390c797ef81822 to 25Q1-release

Change-Id: I282e3c9de948da606c10987f615259b8dbce5b1a