Snap for 6160382 from caff08c9e3658f649d639bbf5b9405b35775a261 to rvc-release

Change-Id: I79e0be6c4130fdddde66b4729218725160d6cc98