Snap for 12765415 from 1f9f22cae214bb7c3fbbd0d4cb5d8db6fc5fa3a6 to 25Q1-release

Change-Id: Ie9969f136bb9841efd9cc1d650106b49945d8987