Snap for 6314400 from b8e281d0761eea2910d6870cbd63b972f429d7da to rvc-release

Change-Id: I3612aa97f212c69875e302418f5af1405ee69d78