Snap for 12748980 from b91aae6073b0471182355189f8675c235a477a99 to 25Q1-release

Change-Id: I47f9ba140b5c6511887cecbbe6dea904cd23a0a9