Snap for 6121193 from e14328b0f351dd23d41eea99e1dd1e015a358237 to rvc-release

Change-Id: I2e13db44cba79095c8872c66c1a094d89987c622