Snap for 12399304 from 48530dafa355382ca09f8bde4e47cd77bf45cafe to 25Q1-release

Change-Id: Ie64308abbc3b0fd5321e2ca7b766ab3121017d44