Snap for 12399304 from 1a255c4507c278c58b7bae5979d51de6c4bfb8fd to 25Q1-release

Change-Id: Ie54ce82d65cf9b7c33e7584c9d4cd5899348e47f