Snap for 12695596 from 8cc222cd3e79fa5190f3aa039a03a4cbea6cfbe7 to 25Q1-release

Change-Id: I342fa8b63b10cc4983f14f1511dfec61d4140d32