Merge "Change to device-tests" into rvc-dev