Snap for 6809626 from b2c0e2fc2f5a0812bfb4aee94fff6fac6a8a825a to rvc-qpr1-release

Change-Id: If9c52530605306f3b7d41fa016ab9c5e942554e7