diff --git a/lib/util/devutil.js b/lib/util/devutil.js
index 0772cfd7..4abc7a00 100644
--- a/lib/util/devutil.js
+++ b/lib/util/devutil.js
@@ -137,6 +137,7 @@ devutil.makeIdentity = function(serial, properties) {
   var cpuPlatform = properties['ro.board.platform']
   var openGLESVersion = properties['ro.opengles.version']
   var marketName = properties['ro.product.device']
+  var customMarketName = properties['debug.stf.product.device']
 
   openGLESVersion = parseInt(openGLESVersion, 10)
   if (isNaN(openGLESVersion)) {
@@ -159,7 +160,10 @@ devutil.makeIdentity = function(serial, properties) {
     model = model.substr(manufacturer.length)
   }
 
-  if (marketName) {
+  if (customMarketName) {
+    marketName = customMarketName
+  }
+  else if (marketName) {
     var devices = androidDeviceList.getDevicesByDeviceId(marketName)
     if (devices.length > 0) {
       marketName = devices[0].name
diff --git a/package.json b/package.json
index f214454b..dac7d285 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@devicefarmer/stf-wiki": "^1.0.0",
     "@julusian/jpeg-turbo": "^0.5.4",
     "@slack/client": "^3.5.4",
-    "android-device-list": "^1.2.1",
+    "android-device-list": "^1.2.7",
     "aws-sdk": "^2.4.13",
     "basic-auth": "^1.0.3",
     "bluebird": "^2.10.1",