Snap for 13226929 from 6dc07389b34627847c54c24a0b028282ea23263c to 25Q2-release

Change-Id: I7bb77d63fa3282264bb5409df5221b4bd464d6af