Merge "device-tests: As a dependency to tests"