Snap for 12524026 from 258158afb6ebb9a65b527f0a02c91a26b8d113ef to 25Q1-release

Change-Id: I57ab0ab1ce1ab6ad16613aa9ed8ef2a9f399378b