Snap for 12763142 from 725eed66b9d84392790d70dba68a9d89e6154aaf to 25Q1-release

Change-Id: Ifb6c0533b83639de168f3c1b220030b548d2a1e6