Merge "Revert "Revert "device-tests: As a dependency to tests"""
am: ba0ebe9230

Change-Id: Ieb8c0e229b0aaab42ea5004102cd9081e9cf3eda