diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp b/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp
index 9c077ee2142f..c3f90ad5c4c7 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp
@@ -980,7 +980,7 @@ BluetoothDaemonGattModule::ServerSendIndicationCmd(
 
 nsresult
 BluetoothDaemonGattModule::ServerSendResponseCmd(
-  int aConnId, int aTransId, BluetoothGattStatus aStatus,
+  int aConnId, int aTransId, uint16_t aStatus,
   const BluetoothGattResponse& aResponse,
   BluetoothGattResultHandler* aRes)
 {
@@ -996,7 +996,7 @@ BluetoothDaemonGattModule::ServerSendResponseCmd(
     aResponse.mHandle,
     aResponse.mOffset,
     PackConversion<BluetoothGattAuthReq, uint8_t>(aResponse.mAuthReq),
-    PackConversion<BluetoothGattStatus, int32_t>(aStatus),
+    PackConversion<uint16_t, int32_t>(aStatus),
     aResponse.mLength,
     PackArray<uint8_t>(aResponse.mValue, aResponse.mLength), *pdu);
 
@@ -1940,7 +1940,7 @@ public:
   operator () (int& aArg1,
                int& aArg2,
                nsString& aArg3,
-               int& aArg4,
+               BluetoothAttributeHandle& aArg4,
                int& aArg5,
                bool& aArg6) const
   {
@@ -2005,7 +2005,7 @@ public:
   operator () (int& aArg1,
                int& aArg2,
                nsString& aArg3,
-               int& aArg4,
+               BluetoothAttributeHandle& aArg4,
                int& aArg5,
                int& aArg6,
                nsAutoArrayPtr<uint8_t>& aArg7,
@@ -2824,7 +2824,7 @@ BluetoothDaemonGattInterface::SendIndication(
 
 void
 BluetoothDaemonGattInterface::SendResponse(
-  int aConnId, int aTransId, BluetoothGattStatus aStatus,
+  int aConnId, int aTransId, uint16_t aStatus,
   const BluetoothGattResponse& aResponse,
   BluetoothGattResultHandler* aRes)
 {
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h
index 7bad8a13b4ae..b3b5c6af6a99 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h
@@ -298,7 +298,7 @@ public:
   /* Send a response for an incoming indication */
   nsresult ServerSendResponseCmd(int aConnId,
                                  int aTransId,
-                                 BluetoothGattStatus aStatus,
+                                 uint16_t aStatus,
                                  const BluetoothGattResponse& aResponse,
                                  BluetoothGattResultHandler* aRes);
   // TODO: Add L support
@@ -655,14 +655,16 @@ protected:
 
   typedef mozilla::ipc::DaemonNotificationRunnable6<
     NotificationHandlerWrapper, void,
-    int, int, nsString, int, int, bool,
-    int, int, const nsAString&, int, int, bool>
+    int, int, nsString, BluetoothAttributeHandle, int, bool,
+    int, int, const nsAString&, const BluetoothAttributeHandle&, int, bool>
     ServerRequestReadNotification;
 
   typedef mozilla::ipc::DaemonNotificationRunnable9<
     NotificationHandlerWrapper, void,
-    int, int, nsString, int, int, int, nsAutoArrayPtr<uint8_t>, bool, bool,
-    int, int, const nsAString&, int, int, int, const uint8_t*, bool, bool>
+    int, int, nsString, BluetoothAttributeHandle, int, int,
+    nsAutoArrayPtr<uint8_t>, bool, bool,
+    int, int, const nsAString&, const BluetoothAttributeHandle&, int, int,
+    const uint8_t*, bool, bool>
     ServerRequestWriteNotification;
 
   typedef mozilla::ipc::DaemonNotificationRunnable4<
@@ -986,7 +988,7 @@ public:
   /* Send a response for an incoming indication */
   void SendResponse(int aConnId,
                     int aTransId,
-                    BluetoothGattStatus aStatus,
+                    uint16_t aStatus,
                     const BluetoothGattResponse& aResponse,
                     BluetoothGattResultHandler* aRes) override;
 
diff --git a/dom/bluetooth/common/BluetoothInterface.cpp b/dom/bluetooth/common/BluetoothInterface.cpp
index 64f97be356aa..40c24817fa8c 100644
--- a/dom/bluetooth/common/BluetoothInterface.cpp
+++ b/dom/bluetooth/common/BluetoothInterface.cpp
@@ -634,15 +634,15 @@ BluetoothGattNotificationHandler::ServiceDeletedNotification(
 
 void
 BluetoothGattNotificationHandler::RequestReadNotification(
-  int aConnId, int aTransId, const nsAString& aBdAddr, int aAttributeHandle,
-  int aOffset, bool aIsLong)
+  int aConnId, int aTransId, const nsAString& aBdAddr,
+  const BluetoothAttributeHandle& aAttributeHandle, int aOffset, bool aIsLong)
 { }
 
 void
 BluetoothGattNotificationHandler::RequestWriteNotification(
-  int aConnId, int aTransId, const nsAString& aBdAddr, int aAttributeHandle,
-  int aOffset, int aLength, const uint8_t* aValue, bool aNeedResponse,
-  bool aIsPrepareWrite)
+  int aConnId, int aTransId, const nsAString& aBdAddr,
+  const BluetoothAttributeHandle& aAttributeHandle, int aOffset, int aLength,
+  const uint8_t* aValue, bool aNeedResponse, bool aIsPrepareWrite)
 { }
 
 void
diff --git a/dom/bluetooth/common/BluetoothInterface.h b/dom/bluetooth/common/BluetoothInterface.h
index a181bc0e10ac..348a9a55eece 100644
--- a/dom/bluetooth/common/BluetoothInterface.h
+++ b/dom/bluetooth/common/BluetoothInterface.h
@@ -613,7 +613,7 @@ public:
   RequestReadNotification(int aConnId,
                           int aTransId,
                           const nsAString& aBdAddr,
-                          int aAttributeHandle,
+                          const BluetoothAttributeHandle& aAttributeHandle,
                           int aOffset,
                           bool aIsLong);
 
@@ -621,7 +621,7 @@ public:
   RequestWriteNotification(int aConnId,
                            int aTransId,
                            const nsAString& aBdAddr,
-                           int aAttributeHandle,
+                           const BluetoothAttributeHandle& aAttributeHandle,
                            int aOffset,
                            int aLength,
                            const uint8_t* aValue,
@@ -917,7 +917,7 @@ public:
   /* Send a response for an incoming indication */
   virtual void SendResponse(int aConnId,
                             int aTransId,
-                            BluetoothGattStatus aStatus,
+                            uint16_t aStatus,
                             const BluetoothGattResponse& aResponse,
                             BluetoothGattResultHandler* aRes) = 0;