Snap for 12439515 from dfdffd07a36af226fe58b0d8fc828a4dbd9c3a25 to 25Q1-release

Change-Id: I06a5161ea75336acbbfcb93f773708c36bf6fd7d