diff --git a/2_device-types/2_6_tablet-reqs.md b/2_device-types/2_6_tablet-reqs.md
index 7babded..431a806 100644
--- a/2_device-types/2_6_tablet-reqs.md
+++ b/2_device-types/2_6_tablet-reqs.md
@@ -27,6 +27,13 @@
 *   [[7.3](#7_3_sensors).4/Tab-1-1] MUST be capable of measuring orientation
 changes up to 1000 degrees per second.
 
+** Gyroscope**
+
+If Tablet device implementations include a 3-axis gyroscope, they:
+
+*   [[7.3](#7_3_sensors).4/Tab-1-1] MUST be capable of measuring orientation changes
+up to 1000 degrees per second.
+
 **Minimum Memory and Storage (Section 7.6.1)**
 
 The screen densities listed for small/normal screens in the handheld
diff --git a/3_software/3_3_native-api-compatibility.md b/3_software/3_3_native-api-compatibility.md
index fd1e785..b960483 100644
--- a/3_software/3_3_native-api-compatibility.md
+++ b/3_software/3_3_native-api-compatibility.md
@@ -16,8 +16,8 @@
 
 Device implementations:
 
-*   [C-0-1] MUST be compatible with one or more defined ABIs and implement
-    compatibility with the Android NDK.
+*   [C-0-1] MUST be compatible with one or more defined [Android NDK ABIs](
+    https://developer.android.com/ndk/guides/abis).
 *   [C-0-2] MUST include support for code running in the managed environment to
     call into native code, using the standard Java Native Interface (JNI)
     semantics.
@@ -32,11 +32,11 @@
 *   [C-0-6] MUST report, via the above parameters, a subset of the following
     list of ABIs and MUST NOT report any ABI not on the list.
 
-     *   `armeabi`
-     *   `armeabi-v7a`
-     *   `arm64-v8a`
-     *   `x86`
-     *   `x86-64`
+     *   `armeabi` (no longer supported as a target by the NDK)
+     *   [`armeabi-v7a`](https://developer.android.com/ndk/guides/abis#v7a)
+     *   [`arm64-v8a`](https://developer.android.com/ndk/guides/abis#arm64-v8a)
+     *   [`x86`](https://developer.android.com/ndk/guides/abis#x86)
+     *   [`x86-64`](https://developer.android.com/ndk/guides/abis#86-64)
 *   [C-0-7] MUST make all the following libraries, providing native APIs,
     available to apps that include native code:
 
diff --git a/3_software/3_8_user-interface-compatibility.md b/3_software/3_8_user-interface-compatibility.md
index 7265e3b..69ef13b 100644
--- a/3_software/3_8_user-interface-compatibility.md
+++ b/3_software/3_8_user-interface-compatibility.md
@@ -521,12 +521,7 @@
 If device implementations support multi-window mode(s), and the split screen
 mode, they:
 
-*   [C-2-1] MUST preload a [resizeable](
-    https://developer.android.com/guide/topics/ui/multi-window.html#configuring)
-    launcher as the default.
-*   [C-2-2] MUST crop the docked activity of a split-screen multi-window but
-    SHOULD show some content of it, if the Launcher app is the focused window.
-*   [C-2-3] MUST honor the declared [`AndroidManifestLayout_minWidth`](
+*   [C-2-1] MUST honor the declared [`AndroidManifestLayout_minWidth`](
     https://developer.android.com/reference/android/R.styleable.html#AndroidManifestLayout_minWidth)
     and [`AndroidManifestLayout_minHeight`](
     https://developer.android.com/reference/android/R.styleable.html#AndroidManifestLayout_minHeight)
diff --git a/5_multimedia/5_1_media-codecs.md b/5_multimedia/5_1_media-codecs.md
index afbfd9c..abe49e0 100644
--- a/5_multimedia/5_1_media-codecs.md
+++ b/5_multimedia/5_1_media-codecs.md
@@ -189,7 +189,6 @@
     <td><ul>
     <li class="table_list">Type 0 and 1 (.mid, .xmf, .mxmf)</li>
     <li class="table_list">RTTTL/RTX (.rtttl, .rtx)</li>
-    <li class="table_list">OTA (.ota)</li>
     <li class="table_list">iMelody (.imy)</li></ul></td>
  </tr>
  <tr>
diff --git a/7_hardware-compatibility/7_1_display-and-graphics.md b/7_hardware-compatibility/7_1_display-and-graphics.md
index ad9e3c6..ab4103b 100644
--- a/7_hardware-compatibility/7_1_display-and-graphics.md
+++ b/7_hardware-compatibility/7_1_display-and-graphics.md
@@ -75,7 +75,7 @@
 [extensions API](
 https://developer.android.com/jetpack/androidx/releases/window-extensions)
 or the stable version of [sidecar API](
-https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/window/window-sidecar/api/0.1.0-alpha01.txt)
+https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:window/window-sidecar/api/)
 to be used by [Window Manager Jetpack](
 https://developer.android.com/jetpack/androidx/releases/window) library.
 
diff --git a/7_hardware-compatibility/7_4_data-connectivity.md b/7_hardware-compatibility/7_4_data-connectivity.md
index f1aa803..7337035 100644
--- a/7_hardware-compatibility/7_4_data-connectivity.md
+++ b/7_hardware-compatibility/7_4_data-connectivity.md
@@ -225,7 +225,9 @@
 *   [C-1-2] MUST declare the `android.hardware.wifi.aware` feature flag.
 *   [C-1-3] MUST support Wi-Fi and Wi-Fi Aware operations concurrently.
 *   [C-1-4] MUST randomize the Wi-Fi Aware management interface address at intervals
-    no longer than 30 minutes and whenever Wi-Fi Aware is enabled.
+    no longer than 30 minutes and whenever Wi-Fi Aware is enabled unless an Aware
+    ranging operation is ongoing or an Aware data-path is active (randomization is not
+    expected for as long as the data-path is active).
 
 If device implementations include support for Wi-Fi Aware and
 Wi-Fi Location as described in [Section 7.4.2.5](#7_4_2_5_Wi-Fi_Location) and