Snap for 12551711 from bb30fea80bc275ef1ec7fa1794ee41d70b9fe439 to 25Q1-release

Change-Id: I9a58e6b5454a027365982d5bac8796c39be212f8