diff --git a/Cargo.lock b/Cargo.lock
index c4ad391b..0c7507a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5872,7 +5872,6 @@ dependencies = [
  "oslog",
  "paranoid-android",
  "parking_lot 0.11.2",
- "parking_lot 0.12.1",
  "rand 0.7.3",
  "range-set-blaze",
  "rust-fsm",
diff --git a/external/keyring-manager b/external/keyring-manager
index b127b2d3..290b1547 160000
--- a/external/keyring-manager
+++ b/external/keyring-manager
@@ -1 +1 @@
-Subproject commit b127b2d3c653fea163a776dd58b3798f28aeeee3
+Subproject commit 290b15474663f38b351ac514f457948b05b782bb
diff --git a/external/keyvaluedb b/external/keyvaluedb
index 0de59504..1430135c 160000
--- a/external/keyvaluedb
+++ b/external/keyvaluedb
@@ -1 +1 @@
-Subproject commit 0de595047a3c8a22b9550a3ab55105d79e7b030b
+Subproject commit 1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0