Snap for 13248265 from 78f66e0b66732695896777df0822c363d5597c1c to 25Q2-release

Change-Id: I4d96b3f0992b29446dfb99326342d08bf44ae2ed