Snap for 12399304 from d9483ea956dadd0c77da9aa6dd75702d5179724e to 25Q1-release

Change-Id: I3c10b7260596c2034bf7da86f88cf7bae0a5c8c0