diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index 14a96d1..7d9057c 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -42,6 +42,7 @@
         "androidx.annotation_annotation",
         "androidx.core_core",
         "auto_value_annotations",
+        "fast-pair-lite-protos",
         "guava",
     ],
     sdk_version: "system_server_current",
diff --git a/nearby/service/java/com/android/server/nearby/common/bluetooth/fastpair/TdsException.java b/nearby/service/java/com/android/server/nearby/common/bluetooth/fastpair/TdsException.java
new file mode 100644
index 0000000..81dadbe
--- /dev/null
+++ b/nearby/service/java/com/android/server/nearby/common/bluetooth/fastpair/TdsException.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.nearby.common.bluetooth.fastpair;
+
+import com.android.server.nearby.proto.FastPairEnums.FastPairEvent.BrEdrHandoverErrorCode;
+
+import com.google.errorprone.annotations.FormatMethod;
+
+/**
+ * Thrown when BR/EDR Handover fails.
+ */
+public class TdsException extends Exception {
+
+    final BrEdrHandoverErrorCode mErrorCode;
+
+    @FormatMethod
+    TdsException(BrEdrHandoverErrorCode errorCode, String format, Object... objects) {
+        super(String.format(format, objects));
+        this.mErrorCode = errorCode;
+    }
+
+    /** Returns error code. */
+    public BrEdrHandoverErrorCode getErrorCode() {
+        return mErrorCode;
+    }
+}
+
diff --git a/nearby/service/proto/Android.bp b/nearby/service/proto/Android.bp
index a7e9292..fa4b04d 100644
--- a/nearby/service/proto/Android.bp
+++ b/nearby/service/proto/Android.bp
@@ -23,4 +23,7 @@
     sdk_version: "system_current",
     min_sdk_version: "30",
     srcs: ["src/fast_pair_enums.proto", "src/nearby_event_codes.proto"],
+    apex_available: [
+        "com.android.nearby",
+    ],
 }
\ No newline at end of file