Snap for 5860386 from 3ca086775197961657a1b4a9f260d54c8a9f53fa to rvc-release

Change-Id: Ic10f3de817fccdcfb311d74b3160e17e17faa603