diff --git a/src/ledflasher/Android.mk b/src/ledflasher/Android.mk
index c385423f11033f1ef59256d204b21894a811324a..fde8150cbf847dbe5b1d8144932befa9965565aa 100644
--- a/src/ledflasher/Android.mk
+++ b/src/ledflasher/Android.mk
@@ -30,11 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
 	libbinderwrapper \
 	libbrillo \
 	libbrillo-binder \
-	libbrillo-dbus \
 	libbrillo-stream \
 	libchrome \
-	libchrome-dbus \
-	libdbus \
 	libutils \
 	libweaved \
 
diff --git a/src/ledflasher/ledflasher.cpp b/src/ledflasher/ledflasher.cpp
index 269c5be9443a319cf6ab060cdb2767bac31ea0f7..de495f3ca2e0b5d69277c3e277f5e836799523df 100644
--- a/src/ledflasher/ledflasher.cpp
+++ b/src/ledflasher/ledflasher.cpp
@@ -274,10 +274,9 @@ void Daemon::UpdateDeviceState() {
   if (!weave_service)
     return;
 
-  brillo::VariantDictionary state_change{
-    {"_ledflasher.status", status_},
-    {"_ledflasher.leds", leds},
-  };
+  base::DictionaryValue state_change;
+  state_change.SetString("_ledflasher.status", status_);
+  state_change.Set("_ledflasher.leds", brillo::ToValue(leds).release());
   weave_service->SetStateProperties(kWeaveComponent, state_change, nullptr);
 }
 
diff --git a/src/ledflasher/ledflasher.rc b/src/ledflasher/ledflasher.rc
index a2c4fe94b092ca1e888d75a2a549edef2a86c948..8e2ac9d7a32190fa146ce4867cbf00eace7dd113 100644
--- a/src/ledflasher/ledflasher.rc
+++ b/src/ledflasher/ledflasher.rc
@@ -1,4 +1,4 @@
 service ledflasher /system/bin/ledflasher
    class late_start
    user system
-   group system dbus
+   group system