diff --git a/Tethering/common/TetheringLib/src/android/net/IIntResultListener.aidl b/Tethering/common/TetheringLib/src/android/net/IIntResultListener.aidl
index c3d66ee145..45245de760 100644
--- a/Tethering/common/TetheringLib/src/android/net/IIntResultListener.aidl
+++ b/Tethering/common/TetheringLib/src/android/net/IIntResultListener.aidl
@@ -18,7 +18,7 @@ package android.net;
 
 /**
  * Listener interface allowing objects to listen to various module event.
- * {@hide}
+ * @hide
  */
 oneway interface IIntResultListener {
     void onResult(int resultCode);
diff --git a/Tethering/common/TetheringLib/src/android/net/TetherStatesParcel.aidl b/Tethering/common/TetheringLib/src/android/net/TetherStatesParcel.aidl
index 43262fb9d1..1c273157d8 100644
--- a/Tethering/common/TetheringLib/src/android/net/TetherStatesParcel.aidl
+++ b/Tethering/common/TetheringLib/src/android/net/TetherStatesParcel.aidl
@@ -20,7 +20,7 @@ import android.net.TetheringInterface;
 
 /**
  * Status details for tethering downstream interfaces.
- * {@hide}
+ * @hide
  */
 parcelable TetherStatesParcel {
     TetheringInterface[] availableList;
diff --git a/Tethering/common/TetheringLib/src/android/net/TetheringManager.java b/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
index a8a471dbc1..c37ee6c5f4 100644
--- a/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
+++ b/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
@@ -381,7 +381,7 @@ public class TetheringManager {
      * @param context Context for the manager.
      * @param connectorSupplier Supplier for the manager connector; may return null while the
      *                          service is not connected.
-     * {@hide}
+     * @hide
      */
     @SystemApi(client = MODULE_LIBRARIES)
     public TetheringManager(@NonNull final Context context,
@@ -574,7 +574,7 @@ public class TetheringManager {
      * already released.
      * 2. This is not synchronous, so it's not useful to use try-with-resources.
      *
-     * {@hide}
+     * @hide
      */
     @SystemApi(client = MODULE_LIBRARIES)
     @SuppressLint("NotCloseable")
@@ -588,7 +588,7 @@ public class TetheringManager {
     /**
      * Callback for requestTetheredInterface.
      *
-     * {@hide}
+     * @hide
      */
     @SystemApi(client = MODULE_LIBRARIES)
     public interface TetheredInterfaceCallback {
@@ -694,7 +694,7 @@ public class TetheringManager {
      * @param iface the interface name to tether.
      * @return error a {@code TETHER_ERROR} value indicating success or failure type
      *
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @SystemApi(client = MODULE_LIBRARIES)
@@ -729,7 +729,7 @@ public class TetheringManager {
      *             On SDK versions after {@link Build.VERSION_CODES.VANILLA_ICE_CREAM}, this will
      *             throw an UnsupportedOperationException.
      *
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @SystemApi(client = MODULE_LIBRARIES)
@@ -758,7 +758,7 @@ public class TetheringManager {
      * used and an entitlement check is needed, downstream USB tethering will be enabled but will
      * not have any upstream.
      *
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @SystemApi(client = MODULE_LIBRARIES)
@@ -1553,7 +1553,7 @@ public class TetheringManager {
      * Helper function of #requestLatestTetheringEntitlementResult to remain backwards compatible
      * with ConnectivityManager#getLatestTetheringEntitlementResult
      *
-     * {@hide}
+     * @hide
      */
     // TODO: improve the usage of ResultReceiver, b/145096122
     @SystemApi(client = MODULE_LIBRARIES)
diff --git a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java
index 12a0c96f0b..8fa3d640b3 100644
--- a/Tethering/src/com/android/networkstack/tethering/BpfUtils.java
+++ b/Tethering/src/com/android/networkstack/tethering/BpfUtils.java
@@ -30,7 +30,7 @@ import java.io.IOException;
 /**
  * The classes and the methods for BPF utilization.
  *
- * {@hide}
+ * @hide
  */
 public class BpfUtils {
     static {
diff --git a/Tethering/src/com/android/networkstack/tethering/util/TetheringUtils.java b/Tethering/src/com/android/networkstack/tethering/util/TetheringUtils.java
index 9392ae8d53..39e22cd0c4 100644
--- a/Tethering/src/com/android/networkstack/tethering/util/TetheringUtils.java
+++ b/Tethering/src/com/android/networkstack/tethering/util/TetheringUtils.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 /**
  * The classes and the methods for tethering utilization.
  *
- * {@hide}
+ * @hide
  */
 public class TetheringUtils {
     static {
diff --git a/Vcn/framework-b/src/android/net/vcn/VcnManager.java b/Vcn/framework-b/src/android/net/vcn/VcnManager.java
index 594bbb8a20..33da18697c 100644
--- a/Vcn/framework-b/src/android/net/vcn/VcnManager.java
+++ b/Vcn/framework-b/src/android/net/vcn/VcnManager.java
@@ -192,7 +192,10 @@ public class VcnManager {
     public static final String VCN_TUNNEL_AGGREGATION_SA_COUNT_MAX_KEY =
             "vcn_tunnel_aggregation_sa_count_max";
 
-    /** List of Carrier Config options to extract from Carrier Config bundles. @hide */
+    /**
+     * List of Carrier Config options to extract from Carrier Config bundles.
+     * @hide
+     */
     @NonNull
     public static final String[] VCN_RELATED_CARRIER_CONFIG_KEYS =
             new String[] {
diff --git a/framework-t/src/android/net/IEthernetManager.aidl b/framework-t/src/android/net/IEthernetManager.aidl
index b9a3b380b8..a6eded331b 100644
--- a/framework-t/src/android/net/IEthernetManager.aidl
+++ b/framework-t/src/android/net/IEthernetManager.aidl
@@ -29,7 +29,7 @@ import java.util.List;
  * Interface that answers queries about, and allows changing
  * ethernet configuration.
  */
-/** {@hide} */
+/** @hide */
 interface IEthernetManager
 {
     String[] getAvailableInterfaces();
diff --git a/framework-t/src/android/net/INetworkStatsService.aidl b/framework-t/src/android/net/INetworkStatsService.aidl
index a02d8d03a6..4d98871fd6 100644
--- a/framework-t/src/android/net/INetworkStatsService.aidl
+++ b/framework-t/src/android/net/INetworkStatsService.aidl
@@ -31,7 +31,7 @@ import android.net.netstats.provider.INetworkStatsProviderCallback;
 import android.os.IBinder;
 import android.os.Messenger;
 
-/** {@hide} */
+/** @hide */
 interface INetworkStatsService {
 
     /** Start a statistics query session. */
diff --git a/framework-t/src/android/net/INetworkStatsSession.aidl b/framework-t/src/android/net/INetworkStatsSession.aidl
index ab70be826f..78dea774d6 100644
--- a/framework-t/src/android/net/INetworkStatsSession.aidl
+++ b/framework-t/src/android/net/INetworkStatsSession.aidl
@@ -20,7 +20,7 @@ import android.net.NetworkStats;
 import android.net.NetworkStatsHistory;
 import android.net.NetworkTemplate;
 
-/** {@hide} */
+/** @hide */
 interface INetworkStatsSession {
 
     /** Return device aggregated network layer usage summary for traffic that matches template. */
diff --git a/framework-t/src/android/net/TrafficStats.java b/framework-t/src/android/net/TrafficStats.java
index 2eebfbfa57..973776e014 100644
--- a/framework-t/src/android/net/TrafficStats.java
+++ b/framework-t/src/android/net/TrafficStats.java
@@ -773,7 +773,7 @@ public class TrafficStats {
         }
     }
 
-    /** {@hide} */
+    /** @hide */
     public static void closeQuietly(INetworkStatsSession session) {
         // TODO: move to NetworkStatsService once it exists
         if (session != null) {
@@ -858,13 +858,13 @@ public class TrafficStats {
         return total;
     }
 
-    /** {@hide} */
+    /** @hide */
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
     public static long getMobileTcpRxPackets() {
         return UNSUPPORTED;
     }
 
-    /** {@hide} */
+    /** @hide */
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
     public static long getMobileTcpTxPackets() {
         return UNSUPPORTED;
@@ -970,25 +970,25 @@ public class TrafficStats {
         return getIfaceStats(iface, TYPE_RX_BYTES);
     }
 
-    /** {@hide} */
+    /** @hide */
     @TestApi
     public static long getLoopbackTxPackets() {
         return getIfaceStats(LOOPBACK_IFACE, TYPE_TX_PACKETS);
     }
 
-    /** {@hide} */
+    /** @hide */
     @TestApi
     public static long getLoopbackRxPackets() {
         return getIfaceStats(LOOPBACK_IFACE, TYPE_RX_PACKETS);
     }
 
-    /** {@hide} */
+    /** @hide */
     @TestApi
     public static long getLoopbackTxBytes() {
         return getIfaceStats(LOOPBACK_IFACE, TYPE_TX_BYTES);
     }
 
-    /** {@hide} */
+    /** @hide */
     @TestApi
     public static long getLoopbackRxBytes() {
         return getIfaceStats(LOOPBACK_IFACE, TYPE_RX_BYTES);
@@ -1325,13 +1325,13 @@ public class TrafficStats {
     }
 
     // NOTE: keep these in sync with {@code com_android_server_net_NetworkStatsService.cpp}.
-    /** {@hide} */
+    /** @hide */
     public static final int TYPE_RX_BYTES = 0;
-    /** {@hide} */
+    /** @hide */
     public static final int TYPE_RX_PACKETS = 1;
-    /** {@hide} */
+    /** @hide */
     public static final int TYPE_TX_BYTES = 2;
-    /** {@hide} */
+    /** @hide */
     public static final int TYPE_TX_PACKETS = 3;
 
     /** @hide */
diff --git a/framework-t/src/android/net/nsd/INsdManager.aidl b/framework-t/src/android/net/nsd/INsdManager.aidl
index 9d14b1a1b9..812d4ede7b 100644
--- a/framework-t/src/android/net/nsd/INsdManager.aidl
+++ b/framework-t/src/android/net/nsd/INsdManager.aidl
@@ -23,7 +23,7 @@ import android.os.Messenger;
 /**
  * Interface that NsdService implements to connect NsdManager clients.
  *
- * {@hide}
+ * @hide
  */
 interface INsdManager {
     INsdServiceConnector connect(INsdManagerCallback cb, boolean useJavaBackend);
diff --git a/framework-t/src/android/net/nsd/INsdServiceConnector.aidl b/framework-t/src/android/net/nsd/INsdServiceConnector.aidl
index 9a3127843c..4534871d89 100644
--- a/framework-t/src/android/net/nsd/INsdServiceConnector.aidl
+++ b/framework-t/src/android/net/nsd/INsdServiceConnector.aidl
@@ -26,7 +26,7 @@ import android.os.Messenger;
 /**
  * Interface that NsdService implements for each NsdManager client.
  *
- * {@hide}
+ * @hide
  */
 interface INsdServiceConnector {
     void registerService(int listenerKey, in AdvertisingRequest advertisingRequest);
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 5a939219b2..c076c25f1c 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -271,7 +271,7 @@ public class ConnectivityManager {
      * our connection to the internet at large.  0 indicates no connection,
      * 100 indicates a great connection.  Retrieve it with
      * {@link android.content.Intent#getIntExtra(String, int)}.
-     * {@hide}
+     * @hide
      */
     public static final String EXTRA_INET_CONDITION = "inetCondition";
     /**
@@ -292,7 +292,7 @@ public class ConnectivityManager {
     /**
      * Key for passing a {@link android.net.captiveportal.CaptivePortalProbeSpec} to the captive
      * portal login activity.
-     * {@hide}
+     * @hide
      */
     @SystemApi
     public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC =
@@ -300,7 +300,7 @@ public class ConnectivityManager {
 
     /**
      * Key for passing a user agent string to the captive portal login activity.
-     * {@hide}
+     * @hide
      */
     @SystemApi
     public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT =
@@ -311,7 +311,7 @@ public class ConnectivityManager {
      * (idle or active) on a network in a recent period.
      * The network becomes active when data transmission is started, or
      * idle if there is no data transmission for a period of time.
-     * {@hide}
+     * @hide
      */
     @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
     public static final String ACTION_DATA_ACTIVITY_CHANGE =
@@ -319,18 +319,18 @@ public class ConnectivityManager {
     /**
      * The lookup key for an enum that indicates the network device type on which this data activity
      * change happens.
-     * {@hide}
+     * @hide
      */
     public static final String EXTRA_DEVICE_TYPE = "deviceType";
     /**
      * The lookup key for a boolean that indicates the device is active or not. {@code true} means
      * it is actively sending or receiving data and {@code false} means it is idle.
-     * {@hide}
+     * @hide
      */
     public static final String EXTRA_IS_ACTIVE = "isActive";
     /**
      * The lookup key for a long that contains the timestamp (nanos) of the radio state change.
-     * {@hide}
+     * @hide
      */
     public static final String EXTRA_REALTIME_NS = "tsNanos";
 
@@ -674,7 +674,7 @@ public class ConnectivityManager {
     /**
      * Over the air Administration.
      * @deprecated Use {@link NetworkCapabilities} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
@@ -683,7 +683,7 @@ public class ConnectivityManager {
     /**
      * IP Multimedia Subsystem.
      * @deprecated Use {@link NetworkCapabilities#NET_CAPABILITY_IMS} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @UnsupportedAppUsage
@@ -692,7 +692,7 @@ public class ConnectivityManager {
     /**
      * Carrier Branded Services.
      * @deprecated Use {@link NetworkCapabilities#NET_CAPABILITY_CBS} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
@@ -702,7 +702,7 @@ public class ConnectivityManager {
      * A Wi-Fi p2p connection. Only requesting processes will have access to
      * the peers connected.
      * @deprecated Use {@link NetworkCapabilities#NET_CAPABILITY_WIFI_P2P} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @SystemApi
@@ -711,7 +711,7 @@ public class ConnectivityManager {
     /**
      * The network to use for initially attaching to the network
      * @deprecated Use {@link NetworkCapabilities#NET_CAPABILITY_IA} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @UnsupportedAppUsage
@@ -721,7 +721,7 @@ public class ConnectivityManager {
      * Emergency PDN connection for emergency services.  This
      * may include IMS and MMS in emergency situations.
      * @deprecated Use {@link NetworkCapabilities#NET_CAPABILITY_EIMS} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
@@ -730,7 +730,7 @@ public class ConnectivityManager {
     /**
      * The network that uses proxy to achieve connectivity.
      * @deprecated Use {@link NetworkCapabilities} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @SystemApi
@@ -789,10 +789,10 @@ public class ConnectivityManager {
     private static final int DEPRECATED_PHONE_CONSTANT_APN_REQUEST_STARTED = 1;
     private static final int DEPRECATED_PHONE_CONSTANT_APN_REQUEST_FAILED = 3;
 
-    /** {@hide} */
+    /** @hide */
     public static final int MAX_RADIO_TYPE = TYPE_TEST;
 
-    /** {@hide} */
+    /** @hide */
     public static final int MAX_NETWORK_TYPE = TYPE_TEST;
 
     private static final int MIN_NETWORK_TYPE = TYPE_MOBILE;
@@ -1293,7 +1293,7 @@ public class ConnectivityManager {
      * @return a String for the given type, or a string version of the type ("87")
      * if no name is known.
      * @deprecated Types are deprecated. Use {@link NetworkCapabilities} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@@ -1362,7 +1362,7 @@ public class ConnectivityManager {
      * @param networkType the type to check
      * @return a boolean - {@code true} if uses cellular network, else {@code false}
      * @deprecated Types are deprecated. Use {@link NetworkCapabilities} instead.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
@@ -1564,7 +1564,7 @@ public class ConnectivityManager {
         return getActiveNetworkForUid(uid, false);
     }
 
-    /** {@hide} */
+    /** @hide */
     public Network getActiveNetworkForUid(int uid, boolean ignoreBlocked) {
         try {
             return mService.getActiveNetworkForUid(uid, ignoreBlocked);
@@ -1734,7 +1734,7 @@ public class ConnectivityManager {
      *        for the given uid or {@code null} if no default network is
      *        available for the specified uid.
      *
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.NETWORK_STACK)
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@@ -1742,7 +1742,7 @@ public class ConnectivityManager {
         return getActiveNetworkInfoForUid(uid, false);
     }
 
-    /** {@hide} */
+    /** @hide */
     public NetworkInfo getActiveNetworkInfoForUid(int uid, boolean ignoreBlocked) {
         try {
             return mService.getActiveNetworkInfoForUid(uid, ignoreBlocked);
@@ -1796,7 +1796,7 @@ public class ConnectivityManager {
         return getNetworkInfoForUid(network, Process.myUid(), false);
     }
 
-    /** {@hide} */
+    /** @hide */
     public NetworkInfo getNetworkInfoForUid(Network network, int uid, boolean ignoreBlocked) {
         try {
             return mService.getNetworkInfoForUid(network, uid, ignoreBlocked);
@@ -1910,7 +1910,7 @@ public class ConnectivityManager {
      *        for the current default network, or {@code null} if there
      *        is no current default network.
      *
-     * {@hide}
+     * @hide
      * @deprecated please use {@link #getLinkProperties(Network)} on the return
      *             value of {@link #getActiveNetwork()} instead. In particular,
      *             this method will return non-null LinkProperties even if the
@@ -1934,7 +1934,7 @@ public class ConnectivityManager {
      *        for the given networkType, or {@code null} if there is
      *        no current default network.
      *
-     * {@hide}
+     * @hide
      * @deprecated This method does not support multiple connected networks
      *             of the same type. Use {@link #getAllNetworks},
      *             {@link #getNetworkInfo(android.net.Network)}, and
@@ -2929,7 +2929,7 @@ public class ConnectivityManager {
     }
 
     /**
-     * {@hide}
+     * @hide
      */
     public ConnectivityManager(Context context, IConnectivityManager service) {
         this(context, service, true /* newStatic */);
@@ -2952,7 +2952,7 @@ public class ConnectivityManager {
         }
     }
 
-    /** {@hide} */
+    /** @hide */
     @UnsupportedAppUsage
     public static ConnectivityManager from(Context context) {
         return (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -3013,7 +3013,7 @@ public class ConnectivityManager {
      * @return an array of 0 or more Strings of tetherable interface names.
      *
      * @deprecated Use {@link TetheringEventCallback#onTetherableInterfacesChanged(List)} instead.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     @UnsupportedAppUsage
@@ -3028,7 +3028,7 @@ public class ConnectivityManager {
      * @return an array of 0 or more String of currently tethered interface names.
      *
      * @deprecated Use {@link TetheringEventCallback#onTetherableInterfacesChanged(List)} instead.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     @UnsupportedAppUsage
@@ -3049,7 +3049,7 @@ public class ConnectivityManager {
      *        which failed to tether.
      *
      * @deprecated Use {@link TetheringEventCallback#onError(String, int)} instead.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     @UnsupportedAppUsage
@@ -3063,7 +3063,7 @@ public class ConnectivityManager {
      *
      * @deprecated This method is not supported.
      * TODO: remove this function when all of clients are removed.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
     @Deprecated
@@ -3095,7 +3095,7 @@ public class ConnectivityManager {
      * @return error a {@code TETHER_ERROR} value indicating success or failure type
      * @deprecated Use {@link TetheringManager#startTethering} instead
      *
-     * {@hide}
+     * @hide
      */
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
     @Deprecated
@@ -3120,7 +3120,7 @@ public class ConnectivityManager {
      * @param iface the interface name to untether.
      * @return error a {@code TETHER_ERROR} value indicating success or failure type
      *
-     * {@hide}
+     * @hide
      */
     @UnsupportedAppUsage
     @Deprecated
@@ -3145,7 +3145,7 @@ public class ConnectivityManager {
      * @return a boolean - {@code true} indicating Tethering is supported.
      *
      * @deprecated Use {@link TetheringEventCallback#onTetheringSupported(boolean)} instead.
-     * {@hide}
+     * @hide
      */
     @SystemApi
     @RequiresPermission(anyOf = {android.Manifest.permission.TETHER_PRIVILEGED,
@@ -3357,7 +3357,7 @@ public class ConnectivityManager {
      *        what interfaces are considered tetherable usb interfaces.
      *
      * @deprecated Use {@link TetheringEventCallback#onTetherableInterfaceRegexpsChanged} instead.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     @UnsupportedAppUsage
@@ -3375,7 +3375,7 @@ public class ConnectivityManager {
      *        what interfaces are considered tetherable wifi interfaces.
      *
      * @deprecated Use {@link TetheringEventCallback#onTetherableInterfaceRegexpsChanged} instead.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     @UnsupportedAppUsage
@@ -3394,7 +3394,7 @@ public class ConnectivityManager {
      *
      * @deprecated Use {@link TetheringEventCallback#onTetherableInterfaceRegexpsChanged(
      *TetheringManager.TetheringInterfaceRegexps)} instead.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     @UnsupportedAppUsage
@@ -3419,7 +3419,7 @@ public class ConnectivityManager {
      * @return error a {@code TETHER_ERROR} value indicating success or failure type
      * @deprecated Use {@link TetheringManager#startTethering} instead
      *
-     * {@hide}
+     * @hide
      */
     @UnsupportedAppUsage
     @Deprecated
@@ -3429,97 +3429,97 @@ public class ConnectivityManager {
 
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_NO_ERROR}.
-     * {@hide}
+     * @hide
      */
     @SystemApi
     @Deprecated
     public static final int TETHER_ERROR_NO_ERROR = 0;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_UNKNOWN_IFACE}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_UNKNOWN_IFACE =
             TetheringManager.TETHER_ERROR_UNKNOWN_IFACE;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_SERVICE_UNAVAIL}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_SERVICE_UNAVAIL =
             TetheringManager.TETHER_ERROR_SERVICE_UNAVAIL;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_UNSUPPORTED}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_UNSUPPORTED = TetheringManager.TETHER_ERROR_UNSUPPORTED;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_UNAVAIL_IFACE}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_UNAVAIL_IFACE =
             TetheringManager.TETHER_ERROR_UNAVAIL_IFACE;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_INTERNAL_ERROR}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_MASTER_ERROR =
             TetheringManager.TETHER_ERROR_INTERNAL_ERROR;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_TETHER_IFACE_ERROR}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_TETHER_IFACE_ERROR =
             TetheringManager.TETHER_ERROR_TETHER_IFACE_ERROR;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_UNTETHER_IFACE_ERROR}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR =
             TetheringManager.TETHER_ERROR_UNTETHER_IFACE_ERROR;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_ENABLE_FORWARDING_ERROR}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_ENABLE_NAT_ERROR =
             TetheringManager.TETHER_ERROR_ENABLE_FORWARDING_ERROR;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_DISABLE_FORWARDING_ERROR}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_DISABLE_NAT_ERROR =
             TetheringManager.TETHER_ERROR_DISABLE_FORWARDING_ERROR;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_IFACE_CFG_ERROR}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_IFACE_CFG_ERROR =
             TetheringManager.TETHER_ERROR_IFACE_CFG_ERROR;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_PROVISIONING_FAILED}.
-     * {@hide}
+     * @hide
      */
     @SystemApi
     @Deprecated
     public static final int TETHER_ERROR_PROVISION_FAILED = 11;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_DHCPSERVER_ERROR}.
-     * {@hide}
+     * @hide
      */
     @Deprecated
     public static final int TETHER_ERROR_DHCPSERVER_ERROR =
             TetheringManager.TETHER_ERROR_DHCPSERVER_ERROR;
     /**
      * @deprecated Use {@link TetheringManager#TETHER_ERROR_ENTITLEMENT_UNKNOWN}.
-     * {@hide}
+     * @hide
      */
     @SystemApi
     @Deprecated
@@ -3534,7 +3534,7 @@ public class ConnectivityManager {
      *               interface
      *
      * @deprecated Use {@link TetheringEventCallback#onError(String, int)} instead.
-     * {@hide}
+     * @hide
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@@ -3599,7 +3599,7 @@ public class ConnectivityManager {
      *         notify the caller of the result of entitlement check. The listener may be called zero
      *         or one time.
      * @deprecated Use {@link TetheringManager#requestLatestTetheringEntitlementResult} instead.
-     * {@hide}
+     * @hide
      */
     @SystemApi
     @Deprecated
@@ -3635,7 +3635,7 @@ public class ConnectivityManager {
      * @param networkType The type of network you want to report on
      * @param percentage The quality of the connection 0 is bad, 100 is good
      * @deprecated Types are deprecated. Use {@link #reportNetworkConnectivity} instead.
-     * {@hide}
+     * @hide
      */
     public void reportInetCondition(int networkType, int percentage) {
         printStackTrace();
diff --git a/framework/src/android/net/DhcpInfo.java b/framework/src/android/net/DhcpInfo.java
index 912df67a0b..4d24f580a8 100644
--- a/framework/src/android/net/DhcpInfo.java
+++ b/framework/src/android/net/DhcpInfo.java
@@ -36,7 +36,10 @@ public class DhcpInfo implements Parcelable {
         super();
     }
 
-    /** copy constructor {@hide} */
+    /**
+     * copy constructor
+     * @hide
+     */
     public DhcpInfo(DhcpInfo source) {
         if (source != null) {
             ipAddress = source.ipAddress;
diff --git a/framework/src/android/net/IConnectivityManager.aidl b/framework/src/android/net/IConnectivityManager.aidl
index 0146e729a7..067a76f5bd 100644
--- a/framework/src/android/net/IConnectivityManager.aidl
+++ b/framework/src/android/net/IConnectivityManager.aidl
@@ -54,7 +54,7 @@ import android.os.UserHandle;
  * Interface that answers queries about, and allows changing, the
  * state of network connectivity.
  */
-/** {@hide} */
+/** @hide */
 interface IConnectivityManager
 {
     Network getActiveNetwork();
diff --git a/framework/src/android/net/NetworkAndAgentRegistryParcelable.aidl b/framework/src/android/net/NetworkAndAgentRegistryParcelable.aidl
index 8c01bbcda1..2dfa259882 100644
--- a/framework/src/android/net/NetworkAndAgentRegistryParcelable.aidl
+++ b/framework/src/android/net/NetworkAndAgentRegistryParcelable.aidl
@@ -22,7 +22,7 @@ import android.net.Network;
 /**
  * A pair of Network and NetworkAgentRegistry.
  *
- * {@hide}
+ * @hide
  */
 @JavaDerive(toString=true)
 parcelable NetworkAndAgentRegistryParcelable {
diff --git a/framework/src/android/net/NetworkInfo.java b/framework/src/android/net/NetworkInfo.java
index 7aa984709b..b85f315257 100644
--- a/framework/src/android/net/NetworkInfo.java
+++ b/framework/src/android/net/NetworkInfo.java
@@ -178,7 +178,7 @@ public class NetworkInfo implements Parcelable {
         mState = State.UNKNOWN;
     }
 
-    /** {@hide} */
+    /** @hide */
     @UnsupportedAppUsage
     public NetworkInfo(@NonNull NetworkInfo source) {
         // S- didn't use to crash when passing null. This plants a timebomb where mState and
@@ -445,7 +445,7 @@ public class NetworkInfo implements Parcelable {
 
     /**
      * @deprecated Use {@link NetworkCapabilities#NET_CAPABILITY_NOT_ROAMING} instead.
-     * {@hide}
+     * @hide
      */
     @VisibleForTesting
     @Deprecated
diff --git a/framework/src/android/net/NetworkUtils.java b/framework/src/android/net/NetworkUtils.java
index 6b2eb08f7a..84793a1359 100644
--- a/framework/src/android/net/NetworkUtils.java
+++ b/framework/src/android/net/NetworkUtils.java
@@ -39,7 +39,7 @@ import java.util.TreeSet;
 /**
  * Native methods for managing network interfaces.
  *
- * {@hide}
+ * @hide
  */
 public class NetworkUtils {
     static {
diff --git a/framework/src/android/net/QosCallback.java b/framework/src/android/net/QosCallback.java
index 22f06bc0e6..a7b90a513c 100644
--- a/framework/src/android/net/QosCallback.java
+++ b/framework/src/android/net/QosCallback.java
@@ -35,7 +35,7 @@ import java.util.concurrent.Executor;
  * <li>A network specific issue occurs.  eg. Congestion on a carrier network.</li>
  * <li>The network registered with the callback has no associated QoS providers</li>
  * </ul>
- * {@hide}
+ * @hide
  */
 @SystemApi
 public abstract class QosCallback {
diff --git a/framework/src/android/net/QosCallbackException.java b/framework/src/android/net/QosCallbackException.java
index 7de3dd1376..628dc87ca0 100644
--- a/framework/src/android/net/QosCallbackException.java
+++ b/framework/src/android/net/QosCallbackException.java
@@ -60,32 +60,32 @@ public final class QosCallbackException extends Exception {
     // The constants are used for the sendQosCallbackError system API, so they must not be changed
     // as there may be callers relying on their historical values to call that API.
     // TODO: mark the constants as @SystemApi, since they are necessary to call a system API.
-    /** {@hide} */
+    /** @hide */
     public static final int EX_TYPE_FILTER_NONE = 0;
 
-    /** {@hide} */
+    /** @hide */
     public static final int EX_TYPE_FILTER_NETWORK_RELEASED = 1;
 
-    /** {@hide} */
+    /** @hide */
     public static final int EX_TYPE_FILTER_SOCKET_NOT_BOUND = 2;
 
-    /** {@hide} */
+    /** @hide */
     public static final int EX_TYPE_FILTER_NOT_SUPPORTED = 3;
 
-    /** {@hide} */
+    /** @hide */
     public static final int EX_TYPE_FILTER_SOCKET_LOCAL_ADDRESS_CHANGED = 4;
 
-    /** {@hide} */
+    /** @hide */
     public static final int EX_TYPE_FILTER_SOCKET_NOT_CONNECTED = 5;
 
-    /** {@hide} */
+    /** @hide */
     public static final int EX_TYPE_FILTER_SOCKET_REMOTE_ADDRESS_CHANGED = 6;
 
     /**
      * Creates exception based off of a type and message.  Not all types of exceptions accept a
      * custom message.
      *
-     * {@hide}
+     * @hide
      */
     @NonNull
     public static QosCallbackException createException(@ExceptionType final int type) {
diff --git a/framework/src/android/net/UidRange.aidl b/framework/src/android/net/UidRange.aidl
index f70fc8e2fe..7da6487207 100644
--- a/framework/src/android/net/UidRange.aidl
+++ b/framework/src/android/net/UidRange.aidl
@@ -19,6 +19,6 @@ package android.net;
 /**
  * An inclusive range of UIDs.
  *
- * {@hide}
+ * @hide
  */
 parcelable UidRange;
\ No newline at end of file
diff --git a/nearby/framework/java/android/nearby/FastPairDevice.aidl b/nearby/framework/java/android/nearby/FastPairDevice.aidl
index 5942966994..e3614e6848 100644
--- a/nearby/framework/java/android/nearby/FastPairDevice.aidl
+++ b/nearby/framework/java/android/nearby/FastPairDevice.aidl
@@ -19,6 +19,6 @@ package android.nearby;
 /**
  * A class represents a Fast Pair device that can be discovered by multiple mediums.
  *
- * {@hide}
+ * @hide
  */
 parcelable FastPairDevice;
diff --git a/nearby/framework/java/android/nearby/IBroadcastListener.aidl b/nearby/framework/java/android/nearby/IBroadcastListener.aidl
index 98c7e173ff..91ebbe9129 100644
--- a/nearby/framework/java/android/nearby/IBroadcastListener.aidl
+++ b/nearby/framework/java/android/nearby/IBroadcastListener.aidl
@@ -19,7 +19,7 @@ package android.nearby;
 /**
  * Callback when brodacast status changes.
  *
- * {@hide}
+ * @hide
  */
 oneway interface IBroadcastListener {
     /** Called when the broadcast status changes. */
diff --git a/nearby/framework/java/android/nearby/IScanListener.aidl b/nearby/framework/java/android/nearby/IScanListener.aidl
index 80563b7e8c..f885356437 100644
--- a/nearby/framework/java/android/nearby/IScanListener.aidl
+++ b/nearby/framework/java/android/nearby/IScanListener.aidl
@@ -21,7 +21,7 @@ import android.nearby.NearbyDeviceParcelable;
 /**
  * Binder callback for ScanCallback.
  *
- * {@hide}
+ * @hide
  */
 oneway interface IScanListener {
         /** Reports a {@link NearbyDevice} being discovered. */
diff --git a/nearby/framework/java/android/nearby/OffloadCapability.aidl b/nearby/framework/java/android/nearby/OffloadCapability.aidl
index fe1c45e66b..ae52234ec9 100644
--- a/nearby/framework/java/android/nearby/OffloadCapability.aidl
+++ b/nearby/framework/java/android/nearby/OffloadCapability.aidl
@@ -19,7 +19,7 @@ package android.nearby;
 /**
  * A class that can describe what offload functions are available.
  *
- * {@hide}
+ * @hide
  */
 parcelable OffloadCapability;
 
diff --git a/nearby/framework/java/android/nearby/aidl/IOffloadCallback.aidl b/nearby/framework/java/android/nearby/aidl/IOffloadCallback.aidl
index 8bef8177bb..642a7ff380 100644
--- a/nearby/framework/java/android/nearby/aidl/IOffloadCallback.aidl
+++ b/nearby/framework/java/android/nearby/aidl/IOffloadCallback.aidl
@@ -21,7 +21,7 @@ import android.nearby.OffloadCapability;
 /**
  * Listener for offload queries.
  *
- * {@hide}
+ * @hide
  */
 oneway interface IOffloadCallback {
         /** Invokes when ContextHub transaction completes. */
diff --git a/remoteauth/framework/java/android/remoteauth/IDeviceDiscoveryListener.aidl b/remoteauth/framework/java/android/remoteauth/IDeviceDiscoveryListener.aidl
index 2ad6a6a0d1..2dbb2af079 100644
--- a/remoteauth/framework/java/android/remoteauth/IDeviceDiscoveryListener.aidl
+++ b/remoteauth/framework/java/android/remoteauth/IDeviceDiscoveryListener.aidl
@@ -21,7 +21,7 @@ import android.remoteauth.RemoteDevice;
 /**
  * Binder callback for DeviceDiscoveryCallback.
  *
- * {@hide}
+ * @hide
  */
 oneway interface IDeviceDiscoveryListener {
         /** Reports a {@link RemoteDevice} being discovered. */
diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index be1bbce18d..a96819380c 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -101,7 +101,7 @@ import java.util.StringJoiner;
 /**
  * BpfNetMaps is responsible for providing traffic controller relevant functionality.
  *
- * {@hide}
+ * @hide
  */
 public class BpfNetMaps {
     static {
diff --git a/service/src/com/android/server/connectivity/ClatCoordinator.java b/service/src/com/android/server/connectivity/ClatCoordinator.java
index 0902e1ac30..8266a87212 100644
--- a/service/src/com/android/server/connectivity/ClatCoordinator.java
+++ b/service/src/com/android/server/connectivity/ClatCoordinator.java
@@ -64,7 +64,7 @@ import java.util.Objects;
 /**
  * This coordinator is responsible for providing clat relevant functionality.
  *
- * {@hide}
+ * @hide
  */
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
 public class ClatCoordinator {
diff --git a/staticlibs/device/com/android/net/module/util/BpfUtils.java b/staticlibs/device/com/android/net/module/util/BpfUtils.java
index a41eeba1e2..e6e2f1feaf 100644
--- a/staticlibs/device/com/android/net/module/util/BpfUtils.java
+++ b/staticlibs/device/com/android/net/module/util/BpfUtils.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 /**
  * The classes and the methods for BPF utilization.
  *
- * {@hide}
+ * @hide
  */
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
 public class BpfUtils {
diff --git a/staticlibs/netd/binder/android/net/INetd.aidl b/staticlibs/netd/binder/android/net/INetd.aidl
index be8f538db7..b147126eb6 100644
--- a/staticlibs/netd/binder/android/net/INetd.aidl
+++ b/staticlibs/netd/binder/android/net/INetd.aidl
@@ -28,7 +28,7 @@ import android.net.TetherStatsParcel;
 import android.net.UidRangeParcel;
 import android.net.netd.aidl.NativeUidRangeConfig;
 
-/** {@hide} */
+/** @hide */
 interface INetd {
     /**
      * Returns true if the service is responding.
diff --git a/staticlibs/netd/binder/android/net/INetdUnsolicitedEventListener.aidl b/staticlibs/netd/binder/android/net/INetdUnsolicitedEventListener.aidl
index 652a79cb68..cb0a94dcb3 100644
--- a/staticlibs/netd/binder/android/net/INetdUnsolicitedEventListener.aidl
+++ b/staticlibs/netd/binder/android/net/INetdUnsolicitedEventListener.aidl
@@ -21,7 +21,7 @@ package android.net;
  * This one-way interface groups asynchronous notifications sent
  * by netd to any process that registered itself via INetd.registerUnsolEventListener.
  *
- * {@hide}
+ * @hide
  */
 oneway interface INetdUnsolicitedEventListener {
 
diff --git a/staticlibs/netd/binder/android/net/InterfaceConfigurationParcel.aidl b/staticlibs/netd/binder/android/net/InterfaceConfigurationParcel.aidl
index c20792c0df..fd7d207eb6 100644
--- a/staticlibs/netd/binder/android/net/InterfaceConfigurationParcel.aidl
+++ b/staticlibs/netd/binder/android/net/InterfaceConfigurationParcel.aidl
@@ -19,7 +19,7 @@ package android.net;
 /**
  * Configuration details for a network interface.
  *
- * {@hide}
+ * @hide
  */
 parcelable InterfaceConfigurationParcel {
     @utf8InCpp String ifName;
diff --git a/staticlibs/netd/binder/android/net/MarkMaskParcel.aidl b/staticlibs/netd/binder/android/net/MarkMaskParcel.aidl
index 932b7bffbd..2ce7ff515f 100644
--- a/staticlibs/netd/binder/android/net/MarkMaskParcel.aidl
+++ b/staticlibs/netd/binder/android/net/MarkMaskParcel.aidl
@@ -19,7 +19,7 @@ package android.net;
 /**
  * Structure that stores a firewall mark and its mask.
  *
- * {@hide}
+ * @hide
  */
 parcelable MarkMaskParcel {
     // The fwmark.
diff --git a/staticlibs/netd/binder/android/net/NativeNetworkConfig.aidl b/staticlibs/netd/binder/android/net/NativeNetworkConfig.aidl
index 96eccc7acf..bf2d83facf 100644
--- a/staticlibs/netd/binder/android/net/NativeNetworkConfig.aidl
+++ b/staticlibs/netd/binder/android/net/NativeNetworkConfig.aidl
@@ -22,7 +22,7 @@ import android.net.NativeVpnType;
 /**
  * The configuration to create a network.
  *
- * {@hide}
+ * @hide
  */
 @JavaDerive(toString=true, equals=true)
 @JavaOnlyImmutable
diff --git a/staticlibs/netd/binder/android/net/TetherConfigParcel.aidl b/staticlibs/netd/binder/android/net/TetherConfigParcel.aidl
index 9f371ce106..cba8ca81ae 100644
--- a/staticlibs/netd/binder/android/net/TetherConfigParcel.aidl
+++ b/staticlibs/netd/binder/android/net/TetherConfigParcel.aidl
@@ -19,7 +19,7 @@ package android.net;
 /**
  * The configuration to start tethering.
  *
- * {@hide}
+ * @hide
  */
 parcelable TetherConfigParcel {
     // Whether to enable or disable legacy DNS proxy server.
diff --git a/staticlibs/netd/binder/android/net/TetherOffloadRuleParcel.aidl b/staticlibs/netd/binder/android/net/TetherOffloadRuleParcel.aidl
index c549e610c0..7f71a92c5a 100644
--- a/staticlibs/netd/binder/android/net/TetherOffloadRuleParcel.aidl
+++ b/staticlibs/netd/binder/android/net/TetherOffloadRuleParcel.aidl
@@ -19,7 +19,7 @@ package android.net;
 /**
  * Represents a forwarding rule for tethering offload.
  *
- * {@hide}
+ * @hide
  */
 parcelable TetherOffloadRuleParcel {
     /** The interface index of the input interface. */
diff --git a/staticlibs/netd/binder/android/net/TetherStatsParcel.aidl b/staticlibs/netd/binder/android/net/TetherStatsParcel.aidl
index 6bf60a86e3..c0c8c82706 100644
--- a/staticlibs/netd/binder/android/net/TetherStatsParcel.aidl
+++ b/staticlibs/netd/binder/android/net/TetherStatsParcel.aidl
@@ -19,7 +19,7 @@ package android.net;
 /**
  * The statistics of tethering interface
  *
- * {@hide}
+ * @hide
  */
 parcelable TetherStatsParcel {
     /**
diff --git a/staticlibs/netd/binder/android/net/UidRangeParcel.aidl b/staticlibs/netd/binder/android/net/UidRangeParcel.aidl
index 8f1fef6f11..f18ccb6ab6 100644
--- a/staticlibs/netd/binder/android/net/UidRangeParcel.aidl
+++ b/staticlibs/netd/binder/android/net/UidRangeParcel.aidl
@@ -19,7 +19,7 @@ package android.net;
 /**
  * An inclusive range of UIDs.
  *
- * {@hide}
+ * @hide
  */
 @JavaOnlyImmutable @JavaDerive(toString=true, equals=true)
 parcelable UidRangeParcel {
diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/DiscoveryInfo.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/DiscoveryInfo.aidl
index f8273828b1..e561a6f290 100644
--- a/staticlibs/netd/binder/android/net/mdns/aidl/DiscoveryInfo.aidl
+++ b/staticlibs/netd/binder/android/net/mdns/aidl/DiscoveryInfo.aidl
@@ -33,7 +33,7 @@ package android.net.mdns.aidl;
  * - netId
  * - result
  *
- * {@hide}
+ * @hide
  */
 @JavaOnlyImmutable
 @JavaDerive(equals=true, toString=true)
diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/GetAddressInfo.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/GetAddressInfo.aidl
index d53174a4d7..85faa3dad8 100644
--- a/staticlibs/netd/binder/android/net/mdns/aidl/GetAddressInfo.aidl
+++ b/staticlibs/netd/binder/android/net/mdns/aidl/GetAddressInfo.aidl
@@ -32,7 +32,7 @@ package android.net.mdns.aidl;
  * - address
  * - result
  *
- * {@hide}
+ * @hide
  */
 @JavaOnlyImmutable
 @JavaDerive(equals=true, toString=true)
diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl
index 3bf1da8201..bb825dfb4f 100644
--- a/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl
+++ b/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl
@@ -22,7 +22,7 @@ import android.net.mdns.aidl.IMDnsEventListener;
 import android.net.mdns.aidl.RegistrationInfo;
 import android.net.mdns.aidl.ResolutionInfo;
 
-/** {@hide} */
+/** @hide */
 interface IMDns {
     /**
      * Start the MDNSResponder daemon.
diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl
index f7f028bcb6..7f0b2b04cb 100644
--- a/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl
+++ b/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl
@@ -26,7 +26,7 @@ import android.net.mdns.aidl.ResolutionInfo;
  * This one-way interface defines the asynchronous notifications sent by mdns service to any process
  * that registered itself via IMDns.registerEventListener.
  *
- * {@hide}
+ * @hide
  */
 oneway interface IMDnsEventListener {
     /**
diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/RegistrationInfo.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/RegistrationInfo.aidl
index 5483559453..10cf93a1ca 100644
--- a/staticlibs/netd/binder/android/net/mdns/aidl/RegistrationInfo.aidl
+++ b/staticlibs/netd/binder/android/net/mdns/aidl/RegistrationInfo.aidl
@@ -33,7 +33,7 @@ package android.net.mdns.aidl;
  * - registrationType
  * - result
  *
- * {@hide}
+ * @hide
  */
 @JavaOnlyImmutable
 @JavaDerive(equals=true, toString=true)
diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/ResolutionInfo.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/ResolutionInfo.aidl
index 26e0cee75e..983dac37b1 100644
--- a/staticlibs/netd/binder/android/net/mdns/aidl/ResolutionInfo.aidl
+++ b/staticlibs/netd/binder/android/net/mdns/aidl/ResolutionInfo.aidl
@@ -35,7 +35,7 @@ package android.net.mdns.aidl;
  * - interfaceIdx
  * - result
  *
- * {@hide}
+ * @hide
  */
 @JavaOnlyImmutable
 @JavaDerive(equals=true, toString=true)
diff --git a/staticlibs/netd/binder/android/net/metrics/INetdEventListener.aidl b/staticlibs/netd/binder/android/net/metrics/INetdEventListener.aidl
index ef1b2cbcd2..6634bb4a5f 100644
--- a/staticlibs/netd/binder/android/net/metrics/INetdEventListener.aidl
+++ b/staticlibs/netd/binder/android/net/metrics/INetdEventListener.aidl
@@ -19,7 +19,7 @@ package android.net.metrics;
 /**
  * Logs netd events.
  *
- * {@hide}
+ * @hide
  */
 oneway interface INetdEventListener {
     const int EVENT_GETADDRINFO = 1;
diff --git a/staticlibs/netd/binder/android/net/netd/aidl/NativeUidRangeConfig.aidl b/staticlibs/netd/binder/android/net/netd/aidl/NativeUidRangeConfig.aidl
index 99497a863c..054ebd9877 100644
--- a/staticlibs/netd/binder/android/net/netd/aidl/NativeUidRangeConfig.aidl
+++ b/staticlibs/netd/binder/android/net/netd/aidl/NativeUidRangeConfig.aidl
@@ -21,7 +21,7 @@ import android.net.UidRangeParcel;
 /**
  * The configuration to add or remove UID ranges.
  *
- * {@hide}
+ * @hide
  */
 @JavaDerive(toString=true, equals=true)
 @JavaOnlyImmutable
diff --git a/thread/framework/java/android/net/thread/ActiveOperationalDataset.java b/thread/framework/java/android/net/thread/ActiveOperationalDataset.java
index cd256c9991..51a3f47e27 100644
--- a/thread/framework/java/android/net/thread/ActiveOperationalDataset.java
+++ b/thread/framework/java/android/net/thread/ActiveOperationalDataset.java
@@ -930,7 +930,10 @@ public final class ActiveOperationalDataset implements Parcelable {
             return this;
         }
 
-        /** Adds one more unknown TLV. @hide */
+        /**
+         * Adds one more unknown TLV.
+         * @hide
+         */
         @VisibleForTesting
         @NonNull
         public Builder addUnknownTlv(int type, byte[] value) {
diff --git a/thread/framework/java/android/net/thread/ChannelMaxPower.aidl b/thread/framework/java/android/net/thread/ChannelMaxPower.aidl
index abc00b98ab..0d6f58a97d 100644
--- a/thread/framework/java/android/net/thread/ChannelMaxPower.aidl
+++ b/thread/framework/java/android/net/thread/ChannelMaxPower.aidl
@@ -19,7 +19,7 @@ package android.net.thread;
 /**
  * Mapping from a channel to its max power.
  *
- * {@hide}
+ * @hide
  */
 parcelable ChannelMaxPower {
     int channel; // The Thread radio channel.
diff --git a/thread/framework/java/android/net/thread/IActiveOperationalDatasetReceiver.aidl b/thread/framework/java/android/net/thread/IActiveOperationalDatasetReceiver.aidl
index aba54ebe1e..d6782ee2e2 100644
--- a/thread/framework/java/android/net/thread/IActiveOperationalDatasetReceiver.aidl
+++ b/thread/framework/java/android/net/thread/IActiveOperationalDatasetReceiver.aidl
@@ -18,7 +18,10 @@ package android.net.thread;
 
 import android.net.thread.ActiveOperationalDataset;
 
-/** Receives the result of an operation which returns an Active Operational Dataset. @hide */
+/**
+ * Receives the result of an operation which returns an Active Operational Dataset.
+ * @hide
+ */
 oneway interface IActiveOperationalDatasetReceiver {
     void onSuccess(in ActiveOperationalDataset dataset);
     void onError(int errorCode, String errorMessage);
diff --git a/thread/framework/java/android/net/thread/IConfigurationReceiver.aidl b/thread/framework/java/android/net/thread/IConfigurationReceiver.aidl
index dcc4545515..30dd8de3c0 100644
--- a/thread/framework/java/android/net/thread/IConfigurationReceiver.aidl
+++ b/thread/framework/java/android/net/thread/IConfigurationReceiver.aidl
@@ -18,7 +18,10 @@ package android.net.thread;
 
 import android.net.thread.ThreadConfiguration;
 
-/** Receives the result of a Thread Configuration change. @hide */
+/**
+ * Receives the result of a Thread Configuration change.
+ * @hide
+ */
 oneway interface IConfigurationReceiver {
     void onConfigurationChanged(in ThreadConfiguration configuration);
 }
diff --git a/thread/framework/java/android/net/thread/IOperationReceiver.aidl b/thread/framework/java/android/net/thread/IOperationReceiver.aidl
index 42e157b009..b3b579ab86 100644
--- a/thread/framework/java/android/net/thread/IOperationReceiver.aidl
+++ b/thread/framework/java/android/net/thread/IOperationReceiver.aidl
@@ -16,7 +16,10 @@
 
 package android.net.thread;
 
-/** Receives the result of a Thread network operation. @hide */
+/**
+ * Receives the result of a Thread network operation.
+ * @hide
+ */
 oneway interface IOperationReceiver {
     void onSuccess();
     void onError(int errorCode, String errorMessage);
diff --git a/thread/framework/java/android/net/thread/IOutputReceiver.aidl b/thread/framework/java/android/net/thread/IOutputReceiver.aidl
index b6b4375292..e0990720b6 100644
--- a/thread/framework/java/android/net/thread/IOutputReceiver.aidl
+++ b/thread/framework/java/android/net/thread/IOutputReceiver.aidl
@@ -16,7 +16,10 @@
 
 package android.net.thread;
 
-/** Receives the output of a Thread network operation. @hide */
+/**
+ * Receives the output of a Thread network operation.
+ * @hide
+ */
 oneway interface IOutputReceiver {
     void onOutput(in String output);
     void onComplete();
diff --git a/thread/framework/java/android/net/thread/IScheduleMigrationReceiver.aidl b/thread/framework/java/android/net/thread/IScheduleMigrationReceiver.aidl
index c45d4638c7..872e021387 100644
--- a/thread/framework/java/android/net/thread/IScheduleMigrationReceiver.aidl
+++ b/thread/framework/java/android/net/thread/IScheduleMigrationReceiver.aidl
@@ -16,7 +16,10 @@
 
 package android.net.thread;
 
-/** Receives the result of {@link ThreadNetworkManager#scheduleMigration}. @hide */
+/**
+ * Receives the result of {@link ThreadNetworkManager#scheduleMigration}.
+ * @hide
+ */
 oneway interface IScheduleMigrationReceiver {
     void onScheduled(long delayTimerMillis);
     void onMigrated();
diff --git a/thread/framework/java/android/net/thread/ThreadNetworkController.java b/thread/framework/java/android/net/thread/ThreadNetworkController.java
index b64971614d..b0f58e8388 100644
--- a/thread/framework/java/android/net/thread/ThreadNetworkController.java
+++ b/thread/framework/java/android/net/thread/ThreadNetworkController.java
@@ -137,7 +137,10 @@ public final class ThreadNetworkController {
     @SuppressLint("MinMaxConstant")
     public static final int MAX_POWER_CHANNEL_DISABLED = Integer.MIN_VALUE;
 
-    /** The maximum lifetime of an ephemeral key. @hide */
+    /**
+     * The maximum lifetime of an ephemeral key.
+     * @hide
+     */
     @NonNull private static final Duration EPHEMERAL_KEY_LIFETIME_MAX = Duration.ofMinutes(10);
 
     /** @hide */