diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index 03f9c8e..9fe55ce 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -123,7 +123,6 @@
   public static class FastPairDataProviderService.FastPairManageAccountDeviceRequest {
     method @NonNull public android.accounts.Account getAccount();
     method @NonNull public android.nearby.FastPairAccountKeyDeviceMetadata getAccountKeyDeviceMetadata();
-    method @Nullable public String getBleAddress();
     method public int getRequestType();
   }
 
@@ -138,32 +137,22 @@
   }
 
   public class FastPairDeviceMetadata {
-    method @Nullable public String getAssistantSetupHalfSheet();
-    method @Nullable public String getAssistantSetupNotification();
     method public int getBleTxPower();
-    method @Nullable public String getConfirmPinDescription();
-    method @Nullable public String getConfirmPinTitle();
     method @Nullable public String getConnectSuccessCompanionAppInstalled();
     method @Nullable public String getConnectSuccessCompanionAppNotInstalled();
     method public int getDeviceType();
     method @Nullable public String getDownloadCompanionAppDescription();
     method @Nullable public String getFailConnectGoToSettingsDescription();
-    method @Nullable public String getFastPairTvConnectDeviceNoAccountDescription();
     method @Nullable public byte[] getImage();
     method @Nullable public String getImageUrl();
     method @Nullable public String getInitialNotificationDescription();
     method @Nullable public String getInitialNotificationDescriptionNoAccount();
     method @Nullable public String getInitialPairingDescription();
     method @Nullable public String getIntentUri();
-    method @Nullable public String getLocale();
     method @Nullable public String getName();
     method @Nullable public String getOpenCompanionAppDescription();
     method @Nullable public String getRetroactivePairingDescription();
     method @Nullable public String getSubsequentPairingDescription();
-    method @Nullable public String getSyncContactsDescription();
-    method @Nullable public String getSyncContactsTitle();
-    method @Nullable public String getSyncSmsDescription();
-    method @Nullable public String getSyncSmsTitle();
     method public float getTriggerDistance();
     method @Nullable public String getTrueWirelessImageUrlCase();
     method @Nullable public String getTrueWirelessImageUrlLeftBud();
@@ -177,32 +166,22 @@
   public static final class FastPairDeviceMetadata.Builder {
     ctor public FastPairDeviceMetadata.Builder();
     method @NonNull public android.nearby.FastPairDeviceMetadata build();
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setAssistantSetupHalfSheet(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setAssistantSetupNotification(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setBleTxPower(int);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setConfirmPinDescription(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setConfirmPinTitle(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setConnectSuccessCompanionAppInstalled(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setConnectSuccessCompanionAppNotInstalled(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setDeviceType(int);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setDownloadCompanionAppDescription(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setFailConnectGoToSettingsDescription(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setFastPairTvConnectDeviceNoAccountDescription(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setImage(@Nullable byte[]);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setImageUrl(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setInitialNotificationDescription(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setInitialNotificationDescriptionNoAccount(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setInitialPairingDescription(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setIntentUri(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setLocale(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setName(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setOpenCompanionAppDescription(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setRetroactivePairingDescription(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setSubsequentPairingDescription(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setSyncContactsDescription(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setSyncContactsTitle(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setSyncSmsDescription(@Nullable String);
-    method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setSyncSmsTitle(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setTriggerDistance(float);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setTrueWirelessImageUrlCase(@Nullable String);
     method @NonNull public android.nearby.FastPairDeviceMetadata.Builder setTrueWirelessImageUrlLeftBud(@Nullable String);
@@ -217,24 +196,15 @@
     method @Nullable public String getActionUrl();
     method public int getActionUrlType();
     method @Nullable public String getAppName();
-    method public int getAttachmentType();
     method @Nullable public byte[] getAuthenticationPublicKeySecp256r1();
-    method @Nullable public byte[] getBleRecordBytes();
-    method public int getDebugCategory();
-    method @Nullable public String getDebugMessage();
     method @Nullable public String getDescription();
     method @Nullable public String getDeviceName();
     method @Nullable public String getDisplayUrl();
-    method @Nullable public String getEntityId();
-    method @Nullable public String getFeatureGraphicUrl();
     method public long getFirstObservationTimestampMillis();
-    method @Nullable public String getGroupId();
     method @Nullable public String getIconFfeUrl();
     method @Nullable public byte[] getIconPng();
     method @Nullable public String getId();
     method public long getLastObservationTimestampMillis();
-    method public int getLastUserExperience();
-    method public long getLostMillis();
     method @Nullable public String getMacAddress();
     method @Nullable public String getPackageName();
     method public long getPendingAppInstallTimestampMillis();
@@ -243,7 +213,6 @@
     method @Nullable public String getTitle();
     method @Nullable public String getTriggerId();
     method public int getTxPower();
-    method public int getType();
   }
 
   public static final class FastPairDiscoveryItem.Builder {
@@ -252,24 +221,15 @@
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setActionUrl(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setActionUrlType(int);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setAppName(@Nullable String);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setAttachmentType(int);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setAuthenticationPublicKeySecp256r1(@Nullable byte[]);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setBleRecordBytes(@Nullable byte[]);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setDebugCategory(int);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setDebugMessage(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setDescription(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setDeviceName(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setDisplayUrl(@Nullable String);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setEntityId(@Nullable String);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setFeatureGraphicUrl(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setFirstObservationTimestampMillis(long);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setGroupId(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setIconFfeUrl(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setIconPng(@Nullable byte[]);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setId(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setLastObservationTimestampMillis(long);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setLastUserExperience(int);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setLostMillis(long);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setMacAddress(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setPackageName(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setPendingAppInstallTimestampMillis(long);
@@ -278,7 +238,6 @@
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setTitle(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setTriggerId(@Nullable String);
     method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setTxPower(int);
-    method @NonNull public android.nearby.FastPairDiscoveryItem.Builder setType(int);
   }
 
   public class FastPairEligibleAccount {
@@ -445,10 +404,8 @@
     field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2
     field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0
     field public static final int SCAN_MODE_NO_POWER = -1; // 0xffffffff
-    field public static final int SCAN_TYPE_EXPOSURE_NOTIFICATION = 4; // 0x4
     field public static final int SCAN_TYPE_FAST_PAIR = 1; // 0x1
-    field public static final int SCAN_TYPE_NEARBY_PRESENCE = 3; // 0x3
-    field public static final int SCAN_TYPE_NEARBY_SHARE = 2; // 0x2
+    field public static final int SCAN_TYPE_NEARBY_PRESENCE = 2; // 0x2
   }
 
   public static final class ScanRequest.Builder {