Snap for 12695596 from 4a7b522be4940571fd77bfff685d812a97df2ed4 to 25Q1-release

Change-Id: I1781c5b0320cb54c8313f6403e348a40697384c3