Snap for 5556694 from 362b46e1eefb94aaa9cb3da36474f19c480a3f1b to rvc-release

Change-Id: I0b75eba6b6ef314a2642de85156a5bea6f217bf4