Snap for 7316203 from 6161f21e50f730f46d2715af88f3a3cf159bce6e to rvc-platform-release

Change-Id: I5360ac48b667c2e2a692dae3cc4c77b6a19a6c86