Snap for 12763142 from 3f3cbc36f9c2254010f04e36027c3233c981e8cf to 25Q1-release

Change-Id: Iccb37d794febaeedc9489d81f3a12473ce0b655f