Snap for 12561555 from f90a504d410aa262f7deb8fd3c9fd84934c80417 to 25Q1-release

Change-Id: Iff7cf0072ea70ace13ff8d0bd0945951049eab2e