Snap for 7040187 from 5a90c02c58f8e65bf98477d7e880f91f13d7b57a to rvc-qpr2-release

Change-Id: Id933bc8ba093b6952c4e88c381bcd635561e238a