diff --git a/nearby/framework/java/android/nearby/DataElement.java b/nearby/framework/java/android/nearby/DataElement.java
index da46424ec6..0aa349910e 100644
--- a/nearby/framework/java/android/nearby/DataElement.java
+++ b/nearby/framework/java/android/nearby/DataElement.java
@@ -109,7 +109,6 @@ public final class DataElement implements Parcelable {
      */
     public DataElement(int key, @NonNull byte[] value) {
         Preconditions.checkArgument(value != null, "value cannot be null");
-        Preconditions.checkArgument(isValidType(key), "key should one of DataElement.DataType");
         mKey = key;
         mValue = value;
     }
diff --git a/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java b/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java
index 6c0d5486c9..180b662580 100644
--- a/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java
+++ b/nearby/framework/java/android/nearby/NearbyDeviceParcelable.java
@@ -216,10 +216,6 @@ public final class NearbyDeviceParcelable implements Parcelable {
                 + Arrays.toString(mData)
                 + ", salt="
                 + Arrays.toString(mSalt)
-                + ", presenceDevice="
-                + mPresenceDevice
-                + ", encryptionKeyTag="
-                + Arrays.toString(mEncryptionKeyTag)
                 + "]";
     }
 
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java
index d3a5c8a0ae..0487aa438d 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyDeviceParcelableTest.java
@@ -86,8 +86,7 @@ public class NearbyDeviceParcelableTest {
                         "NearbyDeviceParcelable[scanType=2, name=testDevice, medium=BLE, "
                                 + "txPower=0, rssi=-60, action=0, bluetoothAddress="
                                 + BLUETOOTH_ADDRESS
-                                + ", fastPairModelId=null, data=null, salt=null,"
-                                + " presenceDevice=null, encryptionKeyTag=null]");
+                                + ", fastPairModelId=null, data=null, salt=null]");
     }
 
     @Test