Snap for 12722466 from d6aa937a1803dcea850e3bc6e2dc0c6ffdca62c0 to 25Q1-release

Change-Id: I76b04908e65fb1f490e2de6c4a27ca4a9750681b