Snap for 12337407 from db4198b019d57680ea3ebbd8e3e680214f097d87 to 25Q1-release

Change-Id: I44259540be2a8935114b4dc5811c191342ff831f