Snap for 6301911 from f7871fdb549b1958ae740fd6cfdad0fa767e0cde to rvc-release

Change-Id: Icd097c568dd6bd4f7e96d9e8bfa2a676c0960420