Snap for 12580585 from 2e95928acd724deaab98ae107dd9c7771d96b12b to 25Q1-release

Change-Id: I3ff25bcbf4d9ad36e3a4688afb9b8037b209cc45