diff --git a/framework/api/current.txt b/framework/api/current.txt
index a9d156961c..a0801499ca 100644
--- a/framework/api/current.txt
+++ b/framework/api/current.txt
@@ -255,7 +255,7 @@ package android.net {
     method @NonNull public android.net.L2capNetworkSpecifier build();
     method @NonNull public android.net.L2capNetworkSpecifier.Builder setHeaderCompression(int);
     method @NonNull public android.net.L2capNetworkSpecifier.Builder setPsm(int);
-    method @NonNull public android.net.L2capNetworkSpecifier.Builder setRemoteAddress(@NonNull android.net.MacAddress);
+    method @NonNull public android.net.L2capNetworkSpecifier.Builder setRemoteAddress(@Nullable android.net.MacAddress);
     method @NonNull public android.net.L2capNetworkSpecifier.Builder setRole(int);
   }
 
diff --git a/framework/src/android/net/L2capNetworkSpecifier.java b/framework/src/android/net/L2capNetworkSpecifier.java
index c7067f6789..82ad05dd77 100644
--- a/framework/src/android/net/L2capNetworkSpecifier.java
+++ b/framework/src/android/net/L2capNetworkSpecifier.java
@@ -178,11 +178,10 @@ public final class L2capNetworkSpecifier extends NetworkSpecifier implements Par
          *
          * Only valid for client networks. A null MacAddress matches *any* MacAddress.
          *
-         * @param remoteAddress the MAC address to connect to.
+         * @param remoteAddress the MAC address to connect to, or null to match any MAC address.
          */
         @NonNull
-        public Builder setRemoteAddress(@NonNull MacAddress remoteAddress) {
-            Objects.requireNonNull(remoteAddress);
+        public Builder setRemoteAddress(@Nullable MacAddress remoteAddress) {
             mRemoteAddress = remoteAddress;
             return this;
         }