Snap for 13219462 from 652881e8dcd6ca372ff862956ca6254fd6f3bf7c to 25Q2-release

Change-Id: I5300232d4533c0bfa8aefd96c90a08a23b5e78ed