Snap for 6866310 from 3b64fd364e3432ac96eceeb8b03aebffaeffef14 to rvc-qpr1-release

Change-Id: Iad89796c35996a7cd16e17608eacab80205106a8