diff --git a/src/com/android/settings/development/OWNERS b/src/com/android/settings/development/OWNERS
index cc573eafbe4..081c44f6821 100644
--- a/src/com/android/settings/development/OWNERS
+++ b/src/com/android/settings/development/OWNERS
@@ -12,3 +12,7 @@ per-file ShowRefreshRatePreferenceController.java=file:platform/frameworks/nativ
 
 # DesktopModePreferenceController
 per-file DesktopModePreferenceController.java=file:platform/frameworks/base:/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS
+
+# ADB
+per-file Adb*=set noparent
+per-file Adb*=file:platform/packages/modules/adb:/OWNERS
diff --git a/src/com/android/settings/wifi/dpp/OWNERS b/src/com/android/settings/wifi/dpp/OWNERS
new file mode 100644
index 00000000000..b61221e5584
--- /dev/null
+++ b/src/com/android/settings/wifi/dpp/OWNERS
@@ -0,0 +1,2 @@
+per-file AdbQrCode.java=set noparent
+per-file AdbQrCode.java=file:platform/packages/modules/adb:/OWNERS
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/OWNERS b/tests/unit/src/com/android/settings/wifi/dpp/OWNERS
new file mode 100644
index 00000000000..84ec8a15249
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/dpp/OWNERS
@@ -0,0 +1,2 @@
+per-file AdbQrCodeTest.java=set noparent
+per-file AdbQrCodeTest.java=file:platform/packages/modules/adb:/OWNERS