Snap for 14295020 from 6f16f4181adeacbbd80e9200a793fe70e9b6e97f to 26Q2-release

Change-Id: I32c6bf841ddab0c9e0ec9dfdb1ebb72302682091