Snap for 6864616 from 4035b79b1dccdcfe483be79073d18937b49223a2 to rvc-qpr1-release

Change-Id: I9e9f93699590d8c1c53f663be5449454be6ee21a