Snap for 12337407 from cbbe0f42ee90e44ab0e04b184b9e8edbc66babbb to 25Q1-release

Change-Id: Ied58904e25c4c51500e25645115a95f470a5f47a