Snap for 12763142 from dc567c24220299a4d957b4ec2c196d025002a8e7 to 25Q1-release

Change-Id: Id081fac9dcbdaed66186b3bb8ce1dfe153f76da9