Snap for 14991244 from 2adc8901f66d388f47e4dcef5c3f4a9ed4d69e75 to 26Q2-release

Change-Id: I0a77f433af1c365e321e74bca519ca5f55f70d33