diff --git a/libsignal-service/protobuf/Groups.proto b/libsignal-service/protobuf/Groups.proto
index bad55e4a1..3f0b7300b 100644
--- a/libsignal-service/protobuf/Groups.proto
+++ b/libsignal-service/protobuf/Groups.proto
@@ -28,7 +28,7 @@ message Member {
   bytes  userId           = 1;
   Role   role             = 2;
   bytes  profileKey       = 3;
-  bytes  presentation     = 4;
+  bytes  presentation     = 4; // Only set when sending to server
   uint32 joinedAtRevision = 5;
 }
 
@@ -41,7 +41,7 @@ message PendingMember {
 message RequestingMember {
     bytes  userId       = 1;
     bytes  profileKey   = 2;
-    bytes  presentation = 3;
+    bytes  presentation = 3; // Only set when sending to server
     uint64 timestamp    = 4;
 }
 
diff --git a/libsignal-service/protobuf/Provisioning.proto b/libsignal-service/protobuf/Provisioning.proto
index 61b97019e..2b9bef426 100644
--- a/libsignal-service/protobuf/Provisioning.proto
+++ b/libsignal-service/protobuf/Provisioning.proto
@@ -32,7 +32,8 @@ message ProvisionMessage {
   optional bytes  profileKey            = 6;
   optional bool   readReceipts          = 7;
   optional uint32 provisioningVersion   = 9;
-  // NEXT ID: 13
+  optional bytes  masterKey             = 13;
+  // NEXT ID: 14
 }
 
 enum ProvisioningVersion {
diff --git a/libsignal-service/protobuf/SignalService.proto b/libsignal-service/protobuf/SignalService.proto
index de9b4ea8d..2de3e6ac7 100644
--- a/libsignal-service/protobuf/SignalService.proto
+++ b/libsignal-service/protobuf/SignalService.proto
@@ -63,27 +63,22 @@ message CallMessage {
     }
 
     optional uint64 id     = 1;
-    // Legacy/deprecated; replaced by 'opaque'
-    optional string sdp    = 2;
+    reserved     /* sdp */   2;
     optional Type   type   = 3;
     optional bytes  opaque = 4;
   }
 
   message Answer {
     optional uint64 id     = 1;
-    // Legacy/deprecated; replaced by 'opaque'
-    optional string sdp    = 2;
+    reserved     /* sdp */   2;
     optional bytes  opaque = 3;
   }
 
   message IceUpdate {
     optional uint64 id     = 1;
-    // Legacy/deprecated; remove when old clients are gone.
-    optional string mid    = 2;
-    // Legacy/deprecated; remove when old clients are gone.
-    optional uint32 line   = 3;
-    // Legacy/deprecated; replaced by 'opaque'
-    optional string sdp    = 4;
+    reserved     /* mid */   2;
+    reserved     /* line */  3;
+    reserved     /* sdp */   4;
     optional bytes  opaque = 5;
   }
 
@@ -118,7 +113,7 @@ message CallMessage {
   optional Offer     offer               = 1;
   optional Answer    answer              = 2;
   repeated IceUpdate iceUpdate           = 3;
-  optional Hangup    legacyHangup        = 4;
+  reserved        /* legacyHangup */       4;
   optional Busy      busy                = 5;
   reserved        /* profileKey */         6;
   optional Hangup    hangup              = 7;
@@ -542,7 +537,9 @@ message SyncMessage {
   }
 
   message Keys {
+    // @deprecated
     optional bytes storageService = 1;
+    optional bytes master         = 2;
   }
 
   message MessageRequestResponse {
@@ -552,6 +549,8 @@ message SyncMessage {
       DELETE           = 2;
       BLOCK            = 3;
       BLOCK_AND_DELETE = 4;
+      SPAM             = 5;
+      BLOCK_AND_SPAM   = 6;
     }
 
     reserved      /*threadE164*/ 1;
@@ -675,7 +674,9 @@ message AttachmentPointer {
   optional uint32  size                    = 4;
   optional bytes   thumbnail               = 5;
   optional bytes   digest                  = 6;
-  optional bytes   incrementalDigest       = 16;
+  reserved                                   16;
+  reserved                                   18;
+  optional bytes   incrementalMac          = 19;
   optional uint32  incrementalMacChunkSize = 17;
   optional string  fileName                = 7;
   optional uint32  flags                   = 8;
@@ -685,7 +686,7 @@ message AttachmentPointer {
   optional string  blurHash                = 12;
   optional uint64  uploadTimestamp         = 13;
   optional uint32  cdnNumber               = 14;
-  // Next ID: 18
+  // Next ID: 19
 }
 
 message GroupContext {
diff --git a/libsignal-service/protobuf/update-protos.sh b/libsignal-service/protobuf/update-protos.sh
index 477d143b2..12d264a1e 100755
--- a/libsignal-service/protobuf/update-protos.sh
+++ b/libsignal-service/protobuf/update-protos.sh
@@ -4,10 +4,10 @@ set -euo pipefail
 update_proto() {
 	case "$1" in
 	  Signal-Android) 
-	  	git_revision="0cdd56e0accfe59e39a312f32bb1463f551dee33"
-		prefix="libsignal/service/src/main/protowire/";;
+	  	git_revision="940cee0f30d6a2873ae08c65bb821c34302ccf5d"
+		prefix="libsignal-service/src/main/protowire/";;
 	  Signal-Desktop)
-	  	git_revision="0e194975a23669263d053b03a42ac52ad38c5d87"
+	  	git_revision="70858d9063446b07b19c03ae7d0c01075a2849e3"
 		prefix="protos/";;
 	esac
 	curl -LOf https://raw.githubusercontent.com/signalapp/${1}/${git_revision}/${prefix}${2}
@@ -20,4 +20,4 @@ update_proto Signal-Android StickerResources.proto
 update_proto Signal-Android WebSocketResources.proto
 
 update_proto Signal-Desktop DeviceName.proto
-update_proto Signal-Desktop UnidentifiedDelivery.proto
\ No newline at end of file
+update_proto Signal-Desktop UnidentifiedDelivery.proto
diff --git a/libsignal-service/src/account_manager.rs b/libsignal-service/src/account_manager.rs
index d2da8efa8..afd630f68 100644
--- a/libsignal-service/src/account_manager.rs
+++ b/libsignal-service/src/account_manager.rs
@@ -327,6 +327,7 @@ impl<Service: PushService> AccountManager<Service> {
             provisioning_code: Some(provisioning_code),
             read_receipts: None,
             user_agent: None,
+            master_key: None, // XXX
         };
 
         let cipher = ProvisioningCipher::from_public(pub_key);