Snap for 12439515 from 615b076317aac33390cd61216b62b24c7752a41f to 25Q1-release

Change-Id: I5a14fd295b11bf0f63a15548fa12fbf789d49164