Snap for 6862191 from dd8ace4f88c01a8f5d8d1473875f1fcb764867b5 to rvc-qpr1-release

Change-Id: Ib929eb7c16392f7a6c4fe5a481958f41c8b701f3