Snap for 12524026 from cbeab5d01811d23ea488efc07f2c31f7c53024e2 to 25Q1-release

Change-Id: Ic8bfd399d1a442f074c145dbf8858324204aa604