Snap for 12337407 from f9bb6e9efe2ea03cfb0cfe32238821047f3acb66 to 25Q1-release

Change-Id: Id62d6084f3caf805b325b38a7824715307569462