Merge "device-tests: As a dependency to tests"
am: 26594fce3f

Change-Id: I657421f3379637084e4b1d51187d733e4c9a0cca