Snap for 12702769 from 1279fbf204c3079416ff13f4c1db5545d2a8ff71 to 25Q1-release

Change-Id: I0f3edc2c04ba9ed3857afdf48cbec684900563c4