Snap for 12704449 from 8cc222cd3e79fa5190f3aa039a03a4cbea6cfbe7 to 25Q2-release

Change-Id: Idc083ad93d4b805b3ff36360ed1e189053abc912