Snap for 12623742 from be66538e2c8b3ccd057422c2474ee8bd4799f8b5 to 25Q1-release

Change-Id: I08beab828746822872ea093d06f8a9dd00fd473b