Snap for 5443283 from 358984eab58c9f778d2c194a317a59e66f999226 to rvc-release

Change-Id: I18f8d1bd919c9e3c2b1dc87fe0e7481c2aeb351b