Snap for 12337407 from 3eb66861916163f703f724bcec6e8dd67508d582 to 25Q1-release

Change-Id: I1c41656ee49e9d5371bf2f5dc996830018903bcd