Snap for 12748980 from deb8af43ea4688b8989743e3b5ad5ffb271bb465 to 25Q1-release

Change-Id: Ia35174405cd40f48d9dcb7dfe3b48bd73dbe7745