Update OWNERS files

- Remove folks no longer on the team/google
- Add bug components for better test failure bug filing

Test: None

Change-Id: I53b00218fe45f52d66c1a7a466b36f39fd1a0a87

diff --git a/annotation/annotation/OWNERS b/annotation/annotation/OWNERS
index e980177..d9e833e 100644
--- a/annotation/annotation/OWNERS
+++ b/annotation/annotation/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461276
 tnorbye@google.com
\ No newline at end of file

diff --git a/appactions/interaction/OWNERS b/appactions/interaction/OWNERS
index 18b6f56..7dbb814 100644
--- a/appactions/interaction/OWNERS
+++ b/appactions/interaction/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1292315
 aliibrahim@google.com
 jaazm@google.com
 mkucharski@google.com
\ No newline at end of file

diff --git a/appcompat/appcompat-lint/integration-tests/OWNERS b/appcompat/appcompat-lint/integration-tests/OWNERS
index 20eea7c..7928c5c 100644
--- a/appcompat/appcompat-lint/integration-tests/OWNERS
+++ b/appcompat/appcompat-lint/integration-tests/OWNERS

@@ -1 +1,2 @@
+# Bug components: 461199
 alanv@google.com

diff --git a/appcompat/appcompat-resources/OWNERS b/appcompat/appcompat-resources/OWNERS
index bef3eaf..4a87ade 100644
--- a/appcompat/appcompat-resources/OWNERS
+++ b/appcompat/appcompat-resources/OWNERS

@@ -1,5 +1,4 @@
-chrisbanes@google.com
-
+# Bug component: 461199
 # For vector related files
 tianliu@google.com
 ilake@google.com

diff --git a/appsearch/appsearch-builtin-types/OWNERS b/appsearch/appsearch-builtin-types/OWNERS
index e863f7d..c0af237 100644
--- a/appsearch/appsearch-builtin-types/OWNERS
+++ b/appsearch/appsearch-builtin-types/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 754644
 ddong@google.com
 saurabhkb@google.com
 quazi@google.com

diff --git a/asynclayoutinflater/OWNERS b/asynclayoutinflater/OWNERS
index 249dcb0..cecc689 100644
--- a/asynclayoutinflater/OWNERS
+++ b/asynclayoutinflater/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461277
 jreck@google.com

diff --git a/autofill/OWNERS b/autofill/OWNERS
index c3c9dc4..76bee66 100644
--- a/autofill/OWNERS
+++ b/autofill/OWNERS

@@ -1,8 +1,6 @@
-adamhe@google.com
+# Bug component: 697479
 augale@google.com
-fengcao@google.com
 jcivelli@google.com
 joannechung@google.com
 lpeter@google.com
-svetoslavganov@google.com
 tymtsai@google.com
\ No newline at end of file

diff --git a/benchmark/OWNERS b/benchmark/OWNERS
index eeaf357..42bca6c 100644
--- a/benchmark/OWNERS
+++ b/benchmark/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1229612
 ccraik@google.com
 dustinlam@google.com
 jgielzak@google.com

diff --git a/biometric/OWNERS b/biometric/OWNERS
index 570673b..d39f34b 100644
--- a/biometric/OWNERS
+++ b/biometric/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 483659
 jbolinger@google.com
 curtislb@google.com
 

diff --git a/bluetooth/OWNERS b/bluetooth/OWNERS
index 3ca2e7e..72e2675 100644
--- a/bluetooth/OWNERS
+++ b/bluetooth/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1190076
 sungsoo@google.com
 hallstrom@google.com
 hdmoon@google.com

diff --git a/browser/OWNERS b/browser/OWNERS
index af78ac1..a8919b3 100644
--- a/browser/OWNERS
+++ b/browser/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461302
 peconn@google.com
 eirage@google.com

diff --git a/camera/camera-camera2-pipe-testing/OWNERS b/camera/camera-camera2-pipe-testing/OWNERS
index 871060e..c445688 100644
--- a/camera/camera-camera2-pipe-testing/OWNERS
+++ b/camera/camera-camera2-pipe-testing/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 575599
 codelogic@google.com
 sushilnath@google.com
 lnishan@google.com

diff --git a/camera/camera-camera2-pipe/OWNERS b/camera/camera-camera2-pipe/OWNERS
index 871060e..c445688 100644
--- a/camera/camera-camera2-pipe/OWNERS
+++ b/camera/camera-camera2-pipe/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 575599
 codelogic@google.com
 sushilnath@google.com
 lnishan@google.com

diff --git a/camera/integration-tests/camerapipetestapp/OWNERS b/camera/integration-tests/camerapipetestapp/OWNERS
index d9e456a..e8b7990 100644
--- a/camera/integration-tests/camerapipetestapp/OWNERS
+++ b/camera/integration-tests/camerapipetestapp/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 575599
 codelogic@google.com
 sushilnath@google.com
\ No newline at end of file

diff --git a/cardview/OWNERS b/cardview/OWNERS
index b9cecf6..bc07458 100644
--- a/cardview/OWNERS
+++ b/cardview/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461354
 alanv@google.com
\ No newline at end of file

diff --git a/collection/OWNERS b/collection/OWNERS
index 0e9710d..1c323f5 100644
--- a/collection/OWNERS
+++ b/collection/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461329
 lukhnos@google.com
 dustinlam@google.com
 yboyar@google.com

diff --git a/compose/benchmark-utils/OWNERS b/compose/benchmark-utils/OWNERS
index b2c0d56..0c37b39 100644
--- a/compose/benchmark-utils/OWNERS
+++ b/compose/benchmark-utils/OWNERS

@@ -1 +1,2 @@
+# Bug component: 1229612
 jellefresen@google.com

diff --git a/compose/integration-tests/demos/OWNERS b/compose/integration-tests/demos/OWNERS
index c606664..ffc7965 100644
--- a/compose/integration-tests/demos/OWNERS
+++ b/compose/integration-tests/demos/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 378604
 adamp@google.com
 mount@google.com
 andreykulikov@google.com

diff --git a/compose/integration-tests/docs-snippets/OWNERS b/compose/integration-tests/docs-snippets/OWNERS
index 0cec323..b91ef39 100644
--- a/compose/integration-tests/docs-snippets/OWNERS
+++ b/compose/integration-tests/docs-snippets/OWNERS

@@ -10,4 +10,3 @@
 stamato@google.com
 riggaroo@google.com
 chrisarriola@google.com
-nickrout@google.com
\ No newline at end of file

diff --git a/compose/integration-tests/material-catalog/OWNERS b/compose/integration-tests/material-catalog/OWNERS
index 02f42a7..71f27c165 100644
--- a/compose/integration-tests/material-catalog/OWNERS
+++ b/compose/integration-tests/material-catalog/OWNERS

@@ -1,3 +1,3 @@
+# Bug component: 489623
 connieshi@google.com
-nickrout@google.com
 sgibly@google.com

diff --git a/compose/material/material/integration-tests/material-catalog/OWNERS b/compose/material/material/integration-tests/material-catalog/OWNERS
index f8b7ec5..bfe5583 100644
--- a/compose/material/material/integration-tests/material-catalog/OWNERS
+++ b/compose/material/material/integration-tests/material-catalog/OWNERS

@@ -1,3 +1,3 @@
+# Bug component: 489623
 connieshi@google.com
-nickrout@google.com
 sgibly@google.com
\ No newline at end of file

diff --git a/compose/material3/material3/integration-tests/material3-catalog/OWNERS b/compose/material3/material3/integration-tests/material3-catalog/OWNERS
deleted file mode 100644
index 5c55131..0000000
--- a/compose/material3/material3/integration-tests/material3-catalog/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-nickrout@google.com

diff --git a/compose/test-utils/OWNERS b/compose/test-utils/OWNERS
index b2c0d56..90ad461 100644
--- a/compose/test-utils/OWNERS
+++ b/compose/test-utils/OWNERS

@@ -1 +1,2 @@
+# Bug component: 741702
 jellefresen@google.com

diff --git a/compose/ui/ui-test-manifest/integration-tests/testapp/OWNERS b/compose/ui/ui-test-manifest/integration-tests/testapp/OWNERS
index b2c0d56..3ac1d26 100644
--- a/compose/ui/ui-test-manifest/integration-tests/testapp/OWNERS
+++ b/compose/ui/ui-test-manifest/integration-tests/testapp/OWNERS

@@ -1 +1,2 @@
+# Bug component: 1070768
 jellefresen@google.com

diff --git a/concurrent/OWNERS b/concurrent/OWNERS
index 36f79b6..b8d37f5 100644
--- a/concurrent/OWNERS
+++ b/concurrent/OWNERS

@@ -1 +1,2 @@
+# Bug component: 610517
 sergeyv@google.com
\ No newline at end of file

diff --git a/constraintlayout/OWNERS b/constraintlayout/OWNERS
index 4a0b20b1..7624d05 100644
--- a/constraintlayout/OWNERS
+++ b/constraintlayout/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 487767
 hoford@google.com
 oscarad@google.com
 shanewong@google.com
\ No newline at end of file

diff --git a/contentpager/OWNERS b/contentpager/OWNERS
deleted file mode 100644
index 779e918..0000000
--- a/contentpager/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-smckay@google.com
\ No newline at end of file

diff --git a/core/core-animation-integration-tests/OWNERS b/core/core-animation-integration-tests/OWNERS
index 9995116..ef35137 100644
--- a/core/core-animation-integration-tests/OWNERS
+++ b/core/core-animation-integration-tests/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461355
 tianliu@google.com
 yaraki@google.com

diff --git a/core/core-animation-testing/OWNERS b/core/core-animation-testing/OWNERS
index 9995116..ef35137 100644
--- a/core/core-animation-testing/OWNERS
+++ b/core/core-animation-testing/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461355
 tianliu@google.com
 yaraki@google.com

diff --git a/core/core-animation/OWNERS b/core/core-animation/OWNERS
index 9995116..ef35137 100644
--- a/core/core-animation/OWNERS
+++ b/core/core-animation/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461355
 tianliu@google.com
 yaraki@google.com

diff --git a/core/core-appdigest/OWNERS b/core/core-appdigest/OWNERS
index dcaa7ff..2386a4e 100644
--- a/core/core-appdigest/OWNERS
+++ b/core/core-appdigest/OWNERS

@@ -1,5 +1,5 @@
+# Bug component: 461355
 alexbuy@google.com
 leegao@google.com
 patb@google.com
-toddke@google.com
 schfan@google.com

diff --git a/core/core-google-shortcuts/OWNERS b/core/core-google-shortcuts/OWNERS
index 35550c2..857d2c44 100644
--- a/core/core-google-shortcuts/OWNERS
+++ b/core/core-google-shortcuts/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461355
 ddong@google.com
 saurabhkb@google.com
 quazi@google.com
\ No newline at end of file

diff --git a/core/core-i18n/OWNERS b/core/core-i18n/OWNERS
index 542c925..508bb53 100644
--- a/core/core-i18n/OWNERS
+++ b/core/core-i18n/OWNERS

@@ -1 +1,2 @@
+# Bug component: 1223796
 mnita@google.com

diff --git a/core/core-location-altitude/OWNERS b/core/core-location-altitude/OWNERS
index b95c469..b2b8f3b 100644
--- a/core/core-location-altitude/OWNERS
+++ b/core/core-location-altitude/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461355
 bjj@google.com
 sooniln@google.com

diff --git a/core/core-performance/OWNERS b/core/core-performance/OWNERS
index faeff8b..da22b63 100644
--- a/core/core-performance/OWNERS
+++ b/core/core-performance/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461355
 essick@google.com
 nchalko@google.com

diff --git a/core/core-remoteviews/OWNERS b/core/core-remoteviews/OWNERS
index b22348c..a6d7a55 100644
--- a/core/core-remoteviews/OWNERS
+++ b/core/core-remoteviews/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461355
 wvk@google.com
 zakcohen@google.com

diff --git a/core/core-role/OWNERS b/core/core-role/OWNERS
index 45d426b..7128279 100644
--- a/core/core-role/OWNERS
+++ b/core/core-role/OWNERS

@@ -1,3 +1,2 @@
-svetoslavganov@google.com
-moltmann@google.com
+# Bug component: 461355
 zhanghai@google.com

diff --git a/core/core-splashscreen/OWNERS b/core/core-splashscreen/OWNERS
index 831d512..43b4e88 100644
--- a/core/core-splashscreen/OWNERS
+++ b/core/core-splashscreen/OWNERS

@@ -1,8 +1,6 @@
+# Bug component: 1163699
 caen@google.com
 jjaggi@google.com
 cinek@google.com
 yaraki@google.com
-chrisbanes@google.com
 wilsonshih@google.com
-
-

diff --git a/core/core/src/androidTest/java/androidx/core/location/OWNERS b/core/core/src/androidTest/java/androidx/core/location/OWNERS
index a420c39..e97396c 100644
--- a/core/core/src/androidTest/java/androidx/core/location/OWNERS
+++ b/core/core/src/androidTest/java/androidx/core/location/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461355
 wyattriley@google.com
 sooniln@google.com
 weiwa@google.com

diff --git a/core/core/src/androidTest/java/androidx/core/view/OWNERS b/core/core/src/androidTest/java/androidx/core/view/OWNERS
index 86f22a5..da18aa6 100644
--- a/core/core/src/androidTest/java/androidx/core/view/OWNERS
+++ b/core/core/src/androidTest/java/androidx/core/view/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461355
 per-file AccessibilityDelegateCompatTest.java = file:accessibility/OWNERS
\ No newline at end of file

diff --git a/core/core/src/main/java/androidx/core/accessibilityservice/OWNERS b/core/core/src/main/java/androidx/core/accessibilityservice/OWNERS
index d29d58d..7aacfcbd 100644
--- a/core/core/src/main/java/androidx/core/accessibilityservice/OWNERS
+++ b/core/core/src/main/java/androidx/core/accessibilityservice/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461355
 include ../view/accessibility/OWNERS
\ No newline at end of file

diff --git a/core/core/src/main/java/androidx/core/location/OWNERS b/core/core/src/main/java/androidx/core/location/OWNERS
index d3f0710..2b8f599 100644
--- a/core/core/src/main/java/androidx/core/location/OWNERS
+++ b/core/core/src/main/java/androidx/core/location/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461355
 wyattriley@google.com
 sooniln@google.com

diff --git a/core/core/src/main/java/androidx/core/view/OWNERS b/core/core/src/main/java/androidx/core/view/OWNERS
index abaadb7..1e4e68f 100644
--- a/core/core/src/main/java/androidx/core/view/OWNERS
+++ b/core/core/src/main/java/androidx/core/view/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461355
 per-file AccessibilityDelegateCompat.java = file:accessibility/OWNERS
\ No newline at end of file

diff --git a/credentials/OWNERS b/credentials/OWNERS
index e8f393e..f306188 100644
--- a/credentials/OWNERS
+++ b/credentials/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1282802
 reemabajwa@google.com
 helenqin@google.com
 sgjerry@google.com

diff --git a/customview/OWNERS b/customview/OWNERS
index 20eea7c..31cd563 100644
--- a/customview/OWNERS
+++ b/customview/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461406
 alanv@google.com

diff --git a/customview/customview-poolingcontainer/OWNERS b/customview/customview-poolingcontainer/OWNERS
index 8a606ef..e2bfd3b 100644
--- a/customview/customview-poolingcontainer/OWNERS
+++ b/customview/customview-poolingcontainer/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461406
 ryanmentley@google.com

diff --git a/documentfile/OWNERS b/documentfile/OWNERS
index f63fcb8..0ad17a7 100644
--- a/documentfile/OWNERS
+++ b/documentfile/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461432
 nandana@google.com
 corinac@google.com

diff --git a/dynamicanimation/OWNERS b/dynamicanimation/OWNERS
index 20360e8..0997ace 100644
--- a/dynamicanimation/OWNERS
+++ b/dynamicanimation/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461200
 tianliu@google.com
\ No newline at end of file

diff --git a/emoji/OWNERS b/emoji/OWNERS
index f52b9a6..e2d3f4c 100644
--- a/emoji/OWNERS
+++ b/emoji/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461226
 clarabayarri@google.com
 siyamed@google.com
\ No newline at end of file

diff --git a/emoji2/OWNERS b/emoji2/OWNERS
index fe41080..6aabaed 100644
--- a/emoji2/OWNERS
+++ b/emoji2/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461226
 clarabayarri@google.com
 siyamed@google.com
 seanmcq@google.com

diff --git a/emoji2/emoji2-emojipicker/OWNERS b/emoji2/emoji2-emojipicker/OWNERS
index be95047..6e11953 100644
--- a/emoji2/emoji2-emojipicker/OWNERS
+++ b/emoji2/emoji2-emojipicker/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461226
 chelseahao@google.com
 linguo@google.com
 scduan@google.com

diff --git a/enterprise/OWNERS b/enterprise/OWNERS
index 73cf679..8f42a2b 100644
--- a/enterprise/OWNERS
+++ b/enterprise/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 606793
 alexkershaw@google.com
 scottjonathan@google.com

diff --git a/fragment/fragment-lint/OWNERS b/fragment/fragment-lint/OWNERS
deleted file mode 100644
index 80569a3..0000000
--- a/fragment/fragment-lint/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-fraschilla@google.com

diff --git a/fragment/fragment-testing-lint/OWNERS b/fragment/fragment-testing-lint/OWNERS
deleted file mode 100644
index 80569a3..0000000
--- a/fragment/fragment-testing-lint/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-fraschilla@google.com

diff --git a/fragment/fragment-testing-manifest-lint/OWNERS b/fragment/fragment-testing-manifest-lint/OWNERS
deleted file mode 100644
index 80569a3..0000000
--- a/fragment/fragment-testing-manifest-lint/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-fraschilla@google.com

diff --git a/fragment/fragment-testing/OWNERS b/fragment/fragment-testing/OWNERS
index 0d174ef..be245e0 100644
--- a/fragment/fragment-testing/OWNERS
+++ b/fragment/fragment-testing/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461227
 hummer@google.com
\ No newline at end of file

diff --git a/fragment/fragment-truth/OWNERS b/fragment/fragment-truth/OWNERS
deleted file mode 100644
index 80569a3..0000000
--- a/fragment/fragment-truth/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-fraschilla@google.com

diff --git a/graphics/filters/OWNERS b/graphics/filters/OWNERS
index 6c8a8b5..1bc1576 100644
--- a/graphics/filters/OWNERS
+++ b/graphics/filters/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1137062
 njawad@google.com
 whisperwing@google.com
 chet@google.com

diff --git a/gridlayout/OWNERS b/gridlayout/OWNERS
index 20eea7c..c352bd1 100644
--- a/gridlayout/OWNERS
+++ b/gridlayout/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461201
 alanv@google.com

diff --git a/health/OWNERS b/health/OWNERS
index 3339b73..ee53f1c 100644
--- a/health/OWNERS
+++ b/health/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1126127
 arkivanov@google.com
 itsleo@google.com
 jstembridge@google.com

diff --git a/health/connect/connect-client/OWNERS b/health/connect/connect-client/OWNERS
index eca4cae..4b5b683 100644
--- a/health/connect/connect-client/OWNERS
+++ b/health/connect/connect-client/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1126127
 arkivanov@google.com
 hengruicao@google.com
 itsleo@google.com

diff --git a/health/health-services-client/OWNERS b/health/health-services-client/OWNERS
index 0e8e33f..7079ccb 100644
--- a/health/health-services-client/OWNERS
+++ b/health/health-services-client/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1126127
 aakanksha@google.com
 jlannin@google.com
 shobana@google.com

diff --git a/javascriptengine/OWNERS b/javascriptengine/OWNERS
index e3fd7e0..8684df8 100644
--- a/javascriptengine/OWNERS
+++ b/javascriptengine/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 1233358
 abhijithnair@google.com
 torne@google.com

diff --git a/leanback/OWNERS b/leanback/OWNERS
index 063702c..729b9b6 100644
--- a/leanback/OWNERS
+++ b/leanback/OWNERS

@@ -1 +1,2 @@
+# Bug component: 188489
 dake@google.com
\ No newline at end of file

diff --git a/leanback/leanback-preference/OWNERS b/leanback/leanback-preference/OWNERS
index 7a6d834..a485005 100644
--- a/leanback/leanback-preference/OWNERS
+++ b/leanback/leanback-preference/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 188489
 nicoya@google.com
 dake@google.com
 zhizhiliu@google.com
\ No newline at end of file

diff --git a/lifecycle/lifecycle-livedata-core-ktx-lint/OWNERS b/lifecycle/lifecycle-livedata-core-ktx-lint/OWNERS
deleted file mode 100644
index 80569a3..0000000
--- a/lifecycle/lifecycle-livedata-core-ktx-lint/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-fraschilla@google.com

diff --git a/lifecycle/lifecycle-livedata-core-truth/OWNERS b/lifecycle/lifecycle-livedata-core-truth/OWNERS
deleted file mode 100644
index 80569a3..0000000
--- a/lifecycle/lifecycle-livedata-core-truth/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-fraschilla@google.com

diff --git a/loader/OWNERS b/loader/OWNERS
index ac839ec..daa5f64 100644
--- a/loader/OWNERS
+++ b/loader/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461381
 ilake@google.com
 mount@google.com
 adamp@google.com

diff --git a/media/version-compat-tests/OWNERS b/media/version-compat-tests/OWNERS
index 96d29ab..362a1a8 100644
--- a/media/version-compat-tests/OWNERS
+++ b/media/version-compat-tests/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 188488
 hdmoon@google.com
 sungsoo@google.com
 dwkang@google.com

diff --git a/media2/integration-tests/testapp/OWNERS b/media2/integration-tests/testapp/OWNERS
index b2c39ea..8050f58 100644
--- a/media2/integration-tests/testapp/OWNERS
+++ b/media2/integration-tests/testapp/OWNERS

@@ -1,8 +1,6 @@
-akersten@google.com
+# Bug component: 188488
 dwkang@google.com
 gyumin@google.com
 hdmoon@google.com
-insun@google.com
 jaewan@google.com
-jinpark@google.com
 sungsoo@google.com

diff --git a/metrics/OWNERS b/metrics/OWNERS
index e28a4db..e5530811 100644
--- a/metrics/OWNERS
+++ b/metrics/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 1109742
 chet@google.com
 ccraik@google.com
\ No newline at end of file

diff --git a/navigation/navigation-runtime-truth/OWNERS b/navigation/navigation-runtime-truth/OWNERS
deleted file mode 100644
index 80569a3..0000000
--- a/navigation/navigation-runtime-truth/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-fraschilla@google.com

diff --git a/paging/paging-compose/OWNERS b/paging/paging-compose/OWNERS
index 64e60ba..09e4523 100644
--- a/paging/paging-compose/OWNERS
+++ b/paging/paging-compose/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461228
 andreykulikov@google.com

diff --git a/percentlayout/OWNERS b/percentlayout/OWNERS
index 20eea7c..c49ddc7 100644
--- a/percentlayout/OWNERS
+++ b/percentlayout/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461485
 alanv@google.com

diff --git a/print/OWNERS b/print/OWNERS
deleted file mode 100644
index a9a2145..0000000
--- a/print/OWNERS
+++ /dev/null

@@ -1,2 +0,0 @@
-moltmann@google.com
-svetoslavganov@google.com
\ No newline at end of file

diff --git a/recommendation/OWNERS b/recommendation/OWNERS
index 063702c..25b28ca 100644
--- a/recommendation/OWNERS
+++ b/recommendation/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461462
 dake@google.com
\ No newline at end of file

diff --git a/recyclerview/recyclerview-selection/OWNERS b/recyclerview/recyclerview-selection/OWNERS
deleted file mode 100644
index 779e918..0000000
--- a/recyclerview/recyclerview-selection/OWNERS
+++ /dev/null

@@ -1 +0,0 @@
-smckay@google.com
\ No newline at end of file

diff --git a/remotecallback/OWNERS b/remotecallback/OWNERS
index 3c245e9..7622b0d 100644
--- a/remotecallback/OWNERS
+++ b/remotecallback/OWNERS

@@ -1,3 +1,2 @@
-jmonk@android.com
-jmonk@google.com
+# Bug component: 606975
 madym@google.com

diff --git a/room/room-compiler-processing/OWNERS b/room/room-compiler-processing/OWNERS
index 23a1553..0a4616b 100644
--- a/room/room-compiler-processing/OWNERS
+++ b/room/room-compiler-processing/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461382
 kuanyingchou@google.com
\ No newline at end of file

diff --git a/samples/MediaRoutingDemo/OWNERS b/samples/MediaRoutingDemo/OWNERS
index 834477b..d9e85fa 100644
--- a/samples/MediaRoutingDemo/OWNERS
+++ b/samples/MediaRoutingDemo/OWNERS

@@ -1 +1,2 @@
+# Bug component: 188488
 file: ../../mediarouter/OWNERS

diff --git a/samples/SupportEmojiDemos/OWNERS b/samples/SupportEmojiDemos/OWNERS
index a2db8f4..8de29ba 100644
--- a/samples/SupportEmojiDemos/OWNERS
+++ b/samples/SupportEmojiDemos/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461226
 siyamed@google.com
\ No newline at end of file

diff --git a/samples/SupportLeanbackDemos/OWNERS b/samples/SupportLeanbackDemos/OWNERS
index 063702c..729b9b6 100644
--- a/samples/SupportLeanbackDemos/OWNERS
+++ b/samples/SupportLeanbackDemos/OWNERS

@@ -1 +1,2 @@
+# Bug component: 188489
 dake@google.com
\ No newline at end of file

diff --git a/samples/SupportPreferenceDemos/OWNERS b/samples/SupportPreferenceDemos/OWNERS
index b2c38b4..1a37d70 100644
--- a/samples/SupportPreferenceDemos/OWNERS
+++ b/samples/SupportPreferenceDemos/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461460
 lpf@google.com
\ No newline at end of file

diff --git a/samples/SupportRemoteCallbackDemos/OWNERS b/samples/SupportRemoteCallbackDemos/OWNERS
index 3c245e9..7622b0d 100644
--- a/samples/SupportRemoteCallbackDemos/OWNERS
+++ b/samples/SupportRemoteCallbackDemos/OWNERS

@@ -1,3 +1,2 @@
-jmonk@android.com
-jmonk@google.com
+# Bug component: 606975
 madym@google.com

diff --git a/samples/SupportSliceDemos/OWNERS b/samples/SupportSliceDemos/OWNERS
index 8a9709c..12152c9 100644
--- a/samples/SupportSliceDemos/OWNERS
+++ b/samples/SupportSliceDemos/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461434
 madym@google.com
 pinyaoting@google.com
 sunnygoyal@google.com

diff --git a/samples/SupportWearDemos/OWNERS b/samples/SupportWearDemos/OWNERS
index a317e85..c51a1b8 100644
--- a/samples/SupportWearDemos/OWNERS
+++ b/samples/SupportWearDemos/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 1235285
 flerda@google.com
 jnichol@google.com

diff --git a/savedstate/OWNERS b/savedstate/OWNERS
index cf853fe..59b2af3 100644
--- a/savedstate/OWNERS
+++ b/savedstate/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 687593
 ilake@google.com
 jbwoods@google.com
 sanura@google.com

diff --git a/security/security-app-authenticator-testing/OWNERS b/security/security-app-authenticator-testing/OWNERS
index 00fc159..3398f39 100644
--- a/security/security-app-authenticator-testing/OWNERS
+++ b/security/security-app-authenticator-testing/OWNERS

@@ -1 +1,2 @@
+# Bug component: 558417
 mpgroover@google.com

diff --git a/security/security-app-authenticator/OWNERS b/security/security-app-authenticator/OWNERS
index fd24685..3393162 100644
--- a/security/security-app-authenticator/OWNERS
+++ b/security/security-app-authenticator/OWNERS

@@ -1 +1,2 @@
+# Bug component: 558417
 mpgroover@google.com
\ No newline at end of file

diff --git a/security/security-biometric/OWNERS b/security/security-biometric/OWNERS
index 8915a5f..cdda268 100644
--- a/security/security-biometric/OWNERS
+++ b/security/security-biometric/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 558417
 danielangell@google.com
 eranm@google.com
 borrelli@google.com

diff --git a/security/security-crypto-ktx/OWNERS b/security/security-crypto-ktx/OWNERS
index 8915a5f..cdda268 100644
--- a/security/security-crypto-ktx/OWNERS
+++ b/security/security-crypto-ktx/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 558417
 danielangell@google.com
 eranm@google.com
 borrelli@google.com

diff --git a/security/security-crypto/OWNERS b/security/security-crypto/OWNERS
index 48f2be8..8ea4d8e 100644
--- a/security/security-crypto/OWNERS
+++ b/security/security-crypto/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 558417
 danielangell@google.com
 eranm@google.com

diff --git a/security/security-identity-credential/OWNERS b/security/security-identity-credential/OWNERS
index 2cfe0ac..92af54e 100644
--- a/security/security-identity-credential/OWNERS
+++ b/security/security-identity-credential/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 558417
 zeuthen@google.com
 swillden@google.com

diff --git a/sharetarget/OWNERS b/sharetarget/OWNERS
index e5d1f0f..faf859a 100644
--- a/sharetarget/OWNERS
+++ b/sharetarget/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 559300
 sunnygoyal@google.com
 pinyaoting@google.com

diff --git a/slice/OWNERS b/slice/OWNERS
index e0582e6..89fc699 100644
--- a/slice/OWNERS
+++ b/slice/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 461434
 timchan@google.com
 sunnygoyal@google.com
 pinyaoting@google.com

diff --git a/slice/slice-builders-ktx/OWNERS b/slice/slice-builders-ktx/OWNERS
index 1706cb06..a211d12 100644
--- a/slice/slice-builders-ktx/OWNERS
+++ b/slice/slice-builders-ktx/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461434
 yboyar@google.com
 madym@google.com

diff --git a/slidingpanelayout/OWNERS b/slidingpanelayout/OWNERS
index 8eb6c00..eadd41a 100644
--- a/slidingpanelayout/OWNERS
+++ b/slidingpanelayout/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461510
 ilake@google.com
 shuanghu@google.com

diff --git a/sqlite/sqlite-ktx/OWNERS b/sqlite/sqlite-ktx/OWNERS
index 6fd8227..bc5e113 100644
--- a/sqlite/sqlite-ktx/OWNERS
+++ b/sqlite/sqlite-ktx/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461409
 yboyar@google.com

diff --git a/startup/OWNERS b/startup/OWNERS
index 0bef8c9..339001a 100644
--- a/startup/OWNERS
+++ b/startup/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 813805
 rahulrav@google.com
 sumir@google.com
 yboyar@google.com

diff --git a/swiperefreshlayout/OWNERS b/swiperefreshlayout/OWNERS
index 8fbda65..f3b3f70 100644
--- a/swiperefreshlayout/OWNERS
+++ b/swiperefreshlayout/OWNERS

@@ -1 +1,2 @@
+# Bug component: 461463
 aelias@google.com
\ No newline at end of file

diff --git a/test/ext/junit-gtest/OWNERS b/test/ext/junit-gtest/OWNERS
index 5cc09b5..4f8127a 100644
--- a/test/ext/junit-gtest/OWNERS
+++ b/test/ext/junit-gtest/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1196313
 fsladkey@google.com
 danalbert@google.com
 asfalcone@google.com
\ No newline at end of file

diff --git a/test/integration-tests/junit-gtest-test/OWNERS b/test/integration-tests/junit-gtest-test/OWNERS
index 5cc09b5..4f8127a 100644
--- a/test/integration-tests/junit-gtest-test/OWNERS
+++ b/test/integration-tests/junit-gtest-test/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 1196313
 fsladkey@google.com
 danalbert@google.com
 asfalcone@google.com
\ No newline at end of file

diff --git a/testutils/testutils-datastore/OWNERS b/testutils/testutils-datastore/OWNERS
index e750dab..6bd3863 100644
--- a/testutils/testutils-datastore/OWNERS
+++ b/testutils/testutils-datastore/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 827162
 dustinlam@google.com
 paulmalolepsy@google.com
 yboyar@google.com

diff --git a/testutils/testutils-macrobenchmark/OWNERS b/testutils/testutils-macrobenchmark/OWNERS
index bd5d7e4..107710a 100644
--- a/testutils/testutils-macrobenchmark/OWNERS
+++ b/testutils/testutils-macrobenchmark/OWNERS

@@ -1 +1,2 @@
+# Bug component: 1229612
 ccraik@google.com
\ No newline at end of file

diff --git a/testutils/testutils-paging/OWNERS b/testutils/testutils-paging/OWNERS
index a69c988..435b10e 100644
--- a/testutils/testutils-paging/OWNERS
+++ b/testutils/testutils-paging/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461228
 ccraik@google.com
 dustinlam@google.com

diff --git a/text/text/OWNERS b/text/text/OWNERS
index 83c9e6d..0db9610 100644
--- a/text/text/OWNERS
+++ b/text/text/OWNERS

@@ -1,3 +1,4 @@
+# Bug component: 630734
 halilibo@google.com
 haoyuchang@google.com
 justinghan@google.com

diff --git a/vectordrawable/integration-tests/testapp/OWNERS b/vectordrawable/integration-tests/testapp/OWNERS
index 9995116..f2f8b9c 100644
--- a/vectordrawable/integration-tests/testapp/OWNERS
+++ b/vectordrawable/integration-tests/testapp/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461333
 tianliu@google.com
 yaraki@google.com

diff --git a/vectordrawable/vectordrawable-seekable/OWNERS b/vectordrawable/vectordrawable-seekable/OWNERS
index 9995116..f2f8b9c 100644
--- a/vectordrawable/vectordrawable-seekable/OWNERS
+++ b/vectordrawable/vectordrawable-seekable/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 461333
 tianliu@google.com
 yaraki@google.com

diff --git a/viewpager2/integration-tests/testapp/OWNERS b/viewpager2/integration-tests/testapp/OWNERS
index e24ee8b..b0972b6c 100644
--- a/viewpager2/integration-tests/testapp/OWNERS
+++ b/viewpager2/integration-tests/testapp/OWNERS

@@ -1 +1,2 @@
+# Bug components: 607924
 jgielzak@google.com
\ No newline at end of file

diff --git a/wear/benchmark/OWNERS b/wear/benchmark/OWNERS
index d4f73cd..a094aed 100644
--- a/wear/benchmark/OWNERS
+++ b/wear/benchmark/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 1235285
 jnichol@google.com
 stevebower@google.com

diff --git a/wear/protolayout/OWNERS b/wear/protolayout/OWNERS
index bc950d4..e9f1fd8 100644
--- a/wear/protolayout/OWNERS
+++ b/wear/protolayout/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 1235285
 msab@google.com
 

diff --git a/wear/wear/OWNERS b/wear/wear/OWNERS
index 314e20b..afc5a30 100644
--- a/wear/wear/OWNERS
+++ b/wear/wear/OWNERS

@@ -1,2 +1,3 @@
+# Bug component: 1235285
 jgarside@google.com
 jnichol@google.com
\ No newline at end of file