Snap for 13248265 from 27cccd8673cd3e29e506e8620781bb3a34429465 to 25Q2-release

Change-Id: I9374de41f18e612734a25a2597b553d022f9ef40