Snap for 6279178 from ea59f9c057940659973bae6eab9b79b6d038125f to rvc-release

Change-Id: I4e4c1d46e8ad5a36f6e4e6f8d75dfcb280e505d6