Merge changes from topic "am-add98e558e714afdb507c739986ad650" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 5f9f05d10a -s ours am: cdc16c0b5b -s ours am: ab2953d122 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adbfe4344e -s ours am: 4f04164e65 -s ours am: c3a0f21946 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 734615d958 -s ours am: 3b105960fd -s ours am: 3842d4732d -s ours
diff --git a/OWNERS_core_networking_xts b/OWNERS_core_networking_xts
index dc92788..8083cbf 100644
--- a/OWNERS_core_networking_xts
+++ b/OWNERS_core_networking_xts
@@ -5,7 +5,3 @@
jchalard@google.com #{LAST_RESORT_SUGGESTION}
maze@google.com #{LAST_RESORT_SUGGESTION}
reminv@google.com #{LAST_RESORT_SUGGESTION}
-
-# Only temporary ownership to improve ethernet code quality (b/236280707)
-# TODO: remove by 12/31/2022
-per-file EthernetManagerTest.java = prohr@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file
diff --git a/tests/cts/OWNERS b/tests/cts/OWNERS
index 875b4a2..089d06f 100644
--- a/tests/cts/OWNERS
+++ b/tests/cts/OWNERS
@@ -1,3 +1,7 @@
# Bug template url: http://b/new?component=31808
set noparent
file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking_xts
+
+# Only temporary ownership to improve ethernet code quality (b/236280707)
+# TODO: remove by 12/31/2022
+per-file net/src/android/net/cts/EthernetManagerTest.kt = prohr@google.com #{LAST_RESORT_SUGGESTION}