Snap for 12763142 from c423dd0a953cf2593fba75a14bee27e0e7c5bf40 to 25Q1-release

Change-Id: I8fc2a939048e49b00278d41bfaef3f1e42f7b377