Snap for 12770256 from ae20f2e08bb57ef3e94ebaac814ed5719838afd3 to 25Q1-release

Change-Id: I1b375014738a72661b375f26c4aadd9b3ca404d1