diff --git a/runtime/factories/android/android.go b/runtime/factories/android/android.go
index c254cc2..8704541 100644
--- a/runtime/factories/android/android.go
+++ b/runtime/factories/android/android.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin
+// +build android
 
 // Package android implements a RuntimeFactory suitable for android.  It is
 // based on the roaming package.
@@ -14,16 +14,20 @@
 
 import (
 	"flag"
+	"os"
 
 	"v.io/x/lib/netconfig"
 	"v.io/x/lib/netstate"
 
 	"v.io/v23"
 	"v.io/v23/context"
+	"v.io/v23/discovery"
 	"v.io/v23/flow"
 	"v.io/v23/rpc"
 
 	"v.io/x/ref/internal/logger"
+	idiscovery "v.io/x/ref/lib/discovery"
+
 	dfactory "v.io/x/ref/lib/discovery/factory"
 	"v.io/x/ref/lib/flags"
 	"v.io/x/ref/lib/pubsub"
@@ -43,6 +47,7 @@
 	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
 	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
 	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh"
+	"v.io/x/ref/lib/discovery/plugins/mdns"
 )
 
 const (
@@ -52,6 +57,8 @@
 
 var commonFlags *flags.Flags
 
+var bleCreator func(string) (idiscovery.Plugin, error)
+
 func init() {
 	v23.RegisterRuntimeFactory(Init)
 	rpc.RegisterUnknownProtocol("wsh", websocket.HybridDial, websocket.HybridResolve, websocket.HybridListener)
@@ -65,7 +72,7 @@
 	}
 
 	ac := appcycle.New()
-	discovery, err := dfactory.New()
+	discovery, err := createDiscovery()
 	if err != nil {
 		ac.Shutdown()
 		return nil, nil, nil, err
@@ -185,3 +192,29 @@
 	watcher.Stop()
 	close(watcherLoop)
 }
+
+
+func createDiscovery() (discovery.T, error) {
+	plugins := make([]idiscovery.Plugin, 2)
+	host, _ := os.Hostname()
+	if host == "" {
+		host = "v23"
+	}
+	var err error
+	plugins[0], err = mdns.New(host)
+	if err != nil {
+		return nil, err
+	}
+
+	plugins[1], err = bleCreator(host)
+	if err != nil {
+		return nil, err
+	}
+
+	return idiscovery.NewWithPlugins(plugins...), nil
+}
+
+// SetBleCreator sets the function that will used to create the ble plugin.
+func SetBleCreator(creator func(string) (idiscovery.Plugin, error)) {
+	bleCreator = creator
+}
diff --git a/runtime/factories/android/proxy.go b/runtime/factories/android/proxy.go
index 3b4f880..d8668fb 100644
--- a/runtime/factories/android/proxy.go
+++ b/runtime/factories/android/proxy.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build android
 package android
 
 import (