diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index f6e2401..7fae99a 100644
--- a/minadbd/adb_main.cpp
+++ b/minadbd/adb_main.cpp
@@ -19,11 +19,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define  TRACE_TAG   TRACE_ADB
+#define TRACE_TAG TRACE_ADB
 
 #include "sysdeps.h"
 
 #include "adb.h"
+#include "adb_auth.h"
 #include "transport.h"
 
 int adb_main(int is_daemon, int server_port)
@@ -35,6 +36,9 @@
     // No SIGCHLD. Let the service subproc handle its children.
     signal(SIGPIPE, SIG_IGN);
 
+    // We can't require authentication for sideloading. http://b/22025550.
+    auth_required = false;
+
     init_transport_registration();
     usb_init();