Snap for 12517605 from a6e0eefe239f54b7bcc33188fdf5cff494747b21 to 25Q1-release

Change-Id: I555ec971b96874a7e0b13cbd456317eae3b6d84f