Snap for 12337407 from 4c8ab210c3fec73a038b10a49753706b6fecdc0c to 25Q1-release

Change-Id: Id15369f27f781c625f70de5b1f3a110d249218b1