--- a/devtools/shared/security/socket.js
+++ b/devtools/shared/security/socket.js
@@ -431,22 +431,25 @@ SocketListener.prototype = {
 
     const self = this;
     return (async function() {
       const backlog = 4;
       self._socket = self._createSocketInstance();
       if (self.isPortBased) {
         const port = Number(self.portOrPath);
         self._socket.initSpecialConnection(port, flags, backlog);
-      } else {
+      } else if (self.portOrPath.startsWith("/")) {
         const file = nsFile(self.portOrPath);
         if (file.exists()) {
           file.remove(false);
         }
         self._socket.initWithFilename(file, parseInt("666", 8), backlog);
+      } else {
+        // Path isn't absolute path, so we use abstract socket address
+        self._socket.initWithAbstractAddress(self.portOrPath, backlog);
       }
       await self._setAdditionalSocketOptions();
       self._socket.asyncListen(self);
       dumpn("Socket listening on: " + (self.port || self.portOrPath));
     })().then(() => {
       this._advertise();
     }).catch(e => {
       dumpn("Could not start debugging listener on '" + this.portOrPath +

--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -360,17 +360,17 @@ pref("geo.enabled", true);
 
 pref("javascript.options.mem.high_water_mark", 32);
 
 pref("dom.max_chrome_script_run_time", 0); // disable slow script dialog for chrome
 pref("dom.max_script_run_time", 20);
 
 // Absolute path to the devtools unix domain socket file used
 // to communicate with a usb cable via adb forward.
-pref("devtools.debugger.unix-domain-socket", "/data/data/@ANDROID_PACKAGE_NAME@/firefox-debugger-socket");
+pref("devtools.debugger.unix-domain-socket", "@ANDROID_PACKAGE_NAME@/firefox-debugger-socket");
 
 pref("devtools.remote.usb.enabled", false);
 pref("devtools.remote.wifi.enabled", false);
 
 pref("font.size.inflation.minTwips", 0);
 
 // When true, zooming will be enabled on all sites, even ones that declare user-scalable=no.
 pref("browser.ui.zoom.force-user-scalable", false);

--- a/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewRemoteDebugger.jsm
@@ -52,29 +52,36 @@ var GeckoViewRemoteDebugger = {
     debug `onEnable`;
     DebuggerServer.init();
     DebuggerServer.registerAllActors();
     const { createRootActor } = require("resource://gre/modules/dbg-browser-actors.js");
     DebuggerServer.setRootActor(createRootActor);
     DebuggerServer.allowChromeProcess = true;
     DebuggerServer.chromeWindowType = "navigator:geckoview";
 
+    // Socket address for USB remote debugger expects
+    // @ANDROID_PACKAGE_NAME/firefox-debugger-socket.
+    // In /proc/net/unix, it will be outputed as
+    // @org.mozilla.geckoview_example/firefox-debugger-socket
+    //
+    // If package name isn't available, it will be "@firefox-debugger-socket".
+
     const env = Cc["@mozilla.org/process/environment;1"]
               .getService(Ci.nsIEnvironment);
-    const dataDir = env.get("MOZ_ANDROID_DATA_DIR");
-
-    if (!dataDir) {
-      warn `Missing env MOZ_ANDROID_DATA_DIR - aborting debugger server start`;
-      return;
+    let packageName = env.get("MOZ_ANDROID_PACKAGE_NAME");
+    if (packageName) {
+      packageName = packageName + "/";
+    } else {
+      warn `Missing env MOZ_ANDROID_PACKAGE_NAME. Unable to get pacakge name`;
     }
 
     this._isEnabled = true;
     this._usbDebugger.stop();
 
-    const portOrPath = dataDir + "/firefox-debugger-socket";
+    const portOrPath = packageName + "firefox-debugger-socket";
     this._usbDebugger.start(portOrPath);
   },
 
   onDisable() {
     if (!this._isEnabled) {
       return;
     }