Snap for 6886900 from f11b01fc87dd0c84f1ff460f19fe1caf78097100 to rvc-qpr2-release

Change-Id: Iaa6eff44690cafc45dbdc160cd88190b7a21243e