Snap for 13197820 from e7011b2f2cb18ea8db49a7b9209bd4604bf37691 to 25Q2-release

Change-Id: I73699580a74e923f524a36bbda299cc2833e84ea