Snap for 12702769 from 79fbb03a8cd7aedfed5f919487c06d51b1aa6cba to 25Q1-release

Change-Id: I06d5fa5bbb25b3d9d7c02414465c3251005d09aa