Snap for 6227479 from 24e35fe5e5d027a2f0f96c568680da1ffc2d303b to rvc-release

Change-Id: I9cf5e868612a07a3f91943623a90c2f269b8e390