Snap for 12573674 from b80822b58c1545e28ed306f8640721cfa177ac60 to 25Q1-release

Change-Id: I8418b9522021eba055b8091b4507d685aebcbcd0