Snap for 12770256 from 813b1cea914950b3d4d17330b3393ee0f68f6437 to 25Q1-release Change-Id: I7b5347e3e53af2569fbdeacd5540692c24249032