diff --git a/activity/activity-ktx/OWNERS b/activity/activity-ktx/OWNERS
index 6fd8227..40fcc5c 100644
--- a/activity/activity-ktx/OWNERS
+++ b/activity/activity-ktx/OWNERS
@@ -1 +1,2 @@
+# Bug component: 530242
 yboyar@google.com
diff --git a/appactions/builtintypes/OWNERS b/appactions/builtintypes/OWNERS
index a07954d..671da19 100644
--- a/appactions/builtintypes/OWNERS
+++ b/appactions/builtintypes/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 1292315
 raghavmehta@google.com
 ddong@google.com
diff --git a/arch/OWNERS b/arch/OWNERS
index 70bfefa..f3a37eb 100644
--- a/arch/OWNERS
+++ b/arch/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 181715
 sergeyv@google.com
 yboyar@google.com
 sanura@google.com
\ No newline at end of file
diff --git a/biometric/biometric-ktx/OWNERS b/biometric/biometric-ktx/OWNERS
index 71f000e..2d066b3 100644
--- a/biometric/biometric-ktx/OWNERS
+++ b/biometric/biometric-ktx/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 483659
 kchyn@google.com
 curtislb@google.com
\ No newline at end of file
diff --git a/buildSrc/OWNERS b/buildSrc/OWNERS
index ec63c9a..be64598 100644
--- a/buildSrc/OWNERS
+++ b/buildSrc/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 461356
 set noparent
 
 jeffrygaston@google.com
diff --git a/compose/desktop/desktop/OWNERS b/compose/desktop/desktop/OWNERS
index a775e737..527b6c2 100644
--- a/compose/desktop/desktop/OWNERS
+++ b/compose/desktop/desktop/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 378604
 jsproch@google.com
 andreykulikov@google.com
 lpf@google.com
diff --git a/compose/integration-tests/docs-snippets/OWNERS b/compose/integration-tests/docs-snippets/OWNERS
index b91ef39..203593b 100644
--- a/compose/integration-tests/docs-snippets/OWNERS
+++ b/compose/integration-tests/docs-snippets/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 378604
 asolovay@google.com
 florinam@google.com
 jolandaverhoef@google.com
diff --git a/compose/lint/OWNERS b/compose/lint/OWNERS
index a973ce0..7fb818d 100644
--- a/compose/lint/OWNERS
+++ b/compose/lint/OWNERS
@@ -1 +1,2 @@
+# Bug component: 378604
 anbailey@google.com
\ No newline at end of file
diff --git a/compose/ui/ui-tooling-data/OWNERS b/compose/ui/ui-tooling-data/OWNERS
index 583d415..f09a8f7 100644
--- a/compose/ui/ui-tooling-data/OWNERS
+++ b/compose/ui/ui-tooling-data/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 378604
 chuckj@google.com
 diegoperez@google.com
 jlauridsen@google.com
\ No newline at end of file
diff --git a/compose/ui/ui-tooling-preview/OWNERS b/compose/ui/ui-tooling-preview/OWNERS
index 7e888c71..4ebd731 100644
--- a/compose/ui/ui-tooling-preview/OWNERS
+++ b/compose/ui/ui-tooling-preview/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 378604
 amaurym@google.com
 diegoperez@google.com
\ No newline at end of file
diff --git a/compose/ui/ui-tooling/OWNERS b/compose/ui/ui-tooling/OWNERS
index 32894f6..07aab4a 100644
--- a/compose/ui/ui-tooling/OWNERS
+++ b/compose/ui/ui-tooling/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 378604
 chuckj@google.com
 diegoperez@google.com
 jlauridsen@google.com
diff --git a/core/core-ktx/OWNERS b/core/core-ktx/OWNERS
index 6fd8227..b8e9338 100644
--- a/core/core-ktx/OWNERS
+++ b/core/core-ktx/OWNERS
@@ -1 +1,2 @@
+# Bug component: 461355
 yboyar@google.com
diff --git a/core/core-location-altitude-proto/OWNERS b/core/core-location-altitude-proto/OWNERS
index b95c469..b2b8f3b 100644
--- a/core/core-location-altitude-proto/OWNERS
+++ b/core/core-location-altitude-proto/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 461355
 bjj@google.com
 sooniln@google.com
diff --git a/credentials/credentials-play-services-auth/OWNERS b/credentials/credentials-play-services-auth/OWNERS
index 7b0e47f..67ec32c 100644
--- a/credentials/credentials-play-services-auth/OWNERS
+++ b/credentials/credentials-play-services-auth/OWNERS
@@ -1,4 +1,4 @@
-# Bug Component: 1218609
+# Bug component: 1218609
 sgjerry@google.com
 helenqin@google.com
 reemabajwa@google.com
diff --git a/cursoradapter/OWNERS b/cursoradapter/OWNERS
index 347e71c..848a497 100644
--- a/cursoradapter/OWNERS
+++ b/cursoradapter/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 461330
 aelias@google.com
 ryanmentley@google.com
diff --git a/draganddrop/OWNERS b/draganddrop/OWNERS
index 7de3c23..a3e7f8f 100644
--- a/draganddrop/OWNERS
+++ b/draganddrop/OWNERS
@@ -1 +1,2 @@
+# Bug component: 1333601
 rledley@google.com
diff --git a/drawerlayout/OWNERS b/drawerlayout/OWNERS
index 347e71c..7b04b71 100644
--- a/drawerlayout/OWNERS
+++ b/drawerlayout/OWNERS
@@ -1,2 +1,3 @@
+# Bug component: 461408
 aelias@google.com
 ryanmentley@google.com
diff --git a/fragment/fragment-ktx/OWNERS b/fragment/fragment-ktx/OWNERS
index 6fd8227..89a4719 100644
--- a/fragment/fragment-ktx/OWNERS
+++ b/fragment/fragment-ktx/OWNERS
@@ -1 +1,2 @@
+# Bug component: 461227
 yboyar@google.com
diff --git a/input/OWNERS b/input/OWNERS
index 492d141..3c18db8 100644
--- a/input/OWNERS
+++ b/input/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 1334004
 joseprio@google.com
 michaelwr@google.com
 svv@google.com
\ No newline at end of file
diff --git a/lifecycle/lifecycle-reactivestreams-ktx/OWNERS b/lifecycle/lifecycle-reactivestreams-ktx/OWNERS
index 6fd8227..b66139d 100644
--- a/lifecycle/lifecycle-reactivestreams-ktx/OWNERS
+++ b/lifecycle/lifecycle-reactivestreams-ktx/OWNERS
@@ -1 +1,2 @@
+# Bug component: 461459
 yboyar@google.com
diff --git a/loader/loader-ktx/OWNERS b/loader/loader-ktx/OWNERS
index 6fd8227..e02f5ed 100644
--- a/loader/loader-ktx/OWNERS
+++ b/loader/loader-ktx/OWNERS
@@ -1 +1,2 @@
+# Bug component: 461381
 yboyar@google.com
diff --git a/palette/OWNERS b/palette/OWNERS
deleted file mode 100644
index c6d7f64..0000000
--- a/palette/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-chrisbanes@google.com
diff --git a/palette/palette-ktx/OWNERS b/palette/palette-ktx/OWNERS
index 6fd8227..c3bcf4a 100644
--- a/palette/palette-ktx/OWNERS
+++ b/palette/palette-ktx/OWNERS
@@ -1 +1,2 @@
+# Bug component: 461229
 yboyar@google.com
diff --git a/preference/preference-ktx/OWNERS b/preference/preference-ktx/OWNERS
index 6fd8227..87591317 100644
--- a/preference/preference-ktx/OWNERS
+++ b/preference/preference-ktx/OWNERS
@@ -1 +1,2 @@
+# Bug component: 461460
 yboyar@google.com
diff --git a/privacysandbox/ui/OWNERS b/privacysandbox/ui/OWNERS
index a322ae5..a75a347 100644
--- a/privacysandbox/ui/OWNERS
+++ b/privacysandbox/ui/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 1314839
 nator@google.com
 akulakov@google.com
 rafaykamran@google.com
diff --git a/profileinstaller/OWNERS b/profileinstaller/OWNERS
index 39b0b2cf..af2acea 100644
--- a/profileinstaller/OWNERS
+++ b/profileinstaller/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 1333524
 seanmcq@google.com
 lelandr@google.com
 rahulrav@google.com
diff --git a/transition/transition-ktx/OWNERS b/transition/transition-ktx/OWNERS
deleted file mode 100644
index e69de29..0000000
--- a/transition/transition-ktx/OWNERS
+++ /dev/null