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

Change-Id: Idde1b5217db2737a9ff57c56b40db7340dd9e776