Merge "Revert "device-tests: As a dependency to tests"" am: 5b216025ba am: 9c0b12db47
am: e95bc4fc6d

Change-Id: I69cb94d34737e1e692015338e40b0708db7ae91f