Snap for 12630846 from 36de58e2bdbb97e7b6322495ab417cbbafeabb42 to 25Q1-release

Change-Id: I4e612b52e9d275a08fa96868d06acbf629ed641a