Snap for 12526387 from f4b32bad7968415f42fb179b9ece0e1d7ad0228b to 25Q1-release

Change-Id: Id353a0847205d243edf92835490cc78ae46413f2