Snap for 12722466 from 156e16b48eb986b163c57868d8ffa946ac8bb76a to 25Q1-release

Change-Id: I4f42bb0ab00c2c868e1f6c80b4e3f2037aa09453