Snap for 12609205 from 6cb03a6374a3565a20e50204de46198dd0cb27a4 to 25Q1-release

Change-Id: I98d21a8548648f069fd44ea2d438b8e3a86de631