Snap for 5491931 from 8ef581d0e534da4447ccd6d820e0954ee4c4862a to rvc-release

Change-Id: I583b206eea389e0e5a0e00395b36bef747a08e97