Snap for 6516174 from 6c4b21fcb87e309e48921a16f05e4853bffe1090 to rvc-release

Change-Id: I1c498754c3bd332815f3b496c048653485ba57bd