Snap for 7040187 from cf7f406c2db5edda6bb030d2d2d9fd31bff84c89 to rvc-qpr2-release

Change-Id: If5856d1b3fd66e4b12808735b5225cca7ba99ec5