Snap for 12673321 from dd8e083fddd914807c4ce0f4e4860ce33c8b8ac2 to 25Q1-release

Change-Id: I711a4fc54544094930d7fd106b030d779bedb42a