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

Change-Id: I15832d0b20788df5374930dc1b09fe0ec9ac3122