Snap for 12370120 from 57b35aa98f3f94774cd171fabdc09034807163fc to 25Q1-release

Change-Id: I97f7bb820ccf5e4f3de8980b80b1092d3764d459