Snap for 5811156 from 91496cee6827b9bafcb8ea0e3416ac9c415efa98 to rvc-release

Change-Id: I5775c4978a497513c6d9722cf17c052c1a5ff200