aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vscode/OWNERS2
-rw-r--r--OWNERS2
-rw-r--r--pw_allocator/OWNERS2
-rw-r--r--pw_analog/OWNERS2
-rw-r--r--pw_android_toolchain/OWNERS2
-rw-r--r--pw_arduino_build/OWNERS2
-rw-r--r--pw_assert/OWNERS2
-rw-r--r--pw_assert_basic/OWNERS2
-rw-r--r--pw_assert_log/OWNERS2
-rw-r--r--pw_assert_tokenized/OWNERS2
-rw-r--r--pw_assert_zephyr/OWNERS2
-rw-r--r--pw_base64/OWNERS2
-rw-r--r--pw_bloat/OWNERS2
-rw-r--r--pw_blob_store/OWNERS2
-rw-r--r--pw_bluetooth_hci/OWNERS2
-rw-r--r--pw_boot/OWNERS2
-rw-r--r--pw_boot_cortex_m/OWNERS2
-rw-r--r--pw_build/OWNERS2
-rw-r--r--pw_build_info/OWNERS2
-rw-r--r--pw_build_mcuxpresso/OWNERS2
-rw-r--r--pw_bytes/OWNERS2
-rw-r--r--pw_checksum/OWNERS2
-rw-r--r--pw_chrono/OWNERS2
-rw-r--r--pw_chrono_embos/OWNERS2
-rw-r--r--pw_chrono_freertos/OWNERS2
-rw-r--r--pw_chrono_stl/OWNERS2
-rw-r--r--pw_chrono_threadx/OWNERS2
-rw-r--r--pw_chrono_zephyr/OWNERS2
-rw-r--r--pw_cli/OWNERS2
-rw-r--r--pw_console/OWNERS2
-rw-r--r--pw_containers/OWNERS2
-rw-r--r--pw_cpu_exception/OWNERS2
-rw-r--r--pw_cpu_exception_cortex_m/OWNERS2
-rw-r--r--pw_crypto/OWNERS2
-rw-r--r--pw_digital_io/OWNERS2
-rw-r--r--pw_docgen/OWNERS2
-rw-r--r--pw_doctor/OWNERS2
-rw-r--r--pw_env_setup/OWNERS2
-rw-r--r--pw_file/OWNERS2
-rw-r--r--pw_function/OWNERS2
-rw-r--r--pw_fuzzer/OWNERS2
-rw-r--r--pw_hdlc/OWNERS2
-rw-r--r--pw_hex_dump/OWNERS2
-rw-r--r--pw_i2c/OWNERS2
-rw-r--r--pw_i2c_mcuxpresso/OWNERS4
-rw-r--r--pw_ide/OWNERS2
-rw-r--r--pw_interrupt/OWNERS2
-rw-r--r--pw_interrupt_cortex_m/OWNERS2
-rw-r--r--pw_interrupt_zephyr/OWNERS2
-rw-r--r--pw_kvs/OWNERS2
-rw-r--r--pw_libc/OWNERS2
-rw-r--r--pw_log/OWNERS2
-rw-r--r--pw_log_basic/OWNERS2
-rw-r--r--pw_log_null/OWNERS2
-rw-r--r--pw_log_rpc/OWNERS2
-rw-r--r--pw_log_string/OWNERS2
-rw-r--r--pw_log_tokenized/OWNERS2
-rw-r--r--pw_log_zephyr/OWNERS2
-rw-r--r--pw_malloc/OWNERS2
-rw-r--r--pw_malloc_freelist/OWNERS2
-rw-r--r--pw_metric/OWNERS2
-rw-r--r--pw_minimal_cpp_stdlib/OWNERS2
-rw-r--r--pw_module/OWNERS2
-rw-r--r--pw_multisink/OWNERS2
-rw-r--r--pw_package/OWNERS2
-rw-r--r--pw_persistent_ram/OWNERS2
-rw-r--r--pw_polyfill/OWNERS2
-rw-r--r--pw_preprocessor/OWNERS2
-rw-r--r--pw_presubmit/OWNERS2
-rw-r--r--pw_protobuf/OWNERS2
-rw-r--r--pw_protobuf_compiler/OWNERS2
-rw-r--r--pw_random/OWNERS2
-rw-r--r--pw_result/OWNERS2
-rw-r--r--pw_ring_buffer/OWNERS2
-rw-r--r--pw_router/OWNERS2
-rw-r--r--pw_rpc/OWNERS2
-rw-r--r--pw_snapshot/OWNERS2
-rw-r--r--pw_software_update/OWNERS2
-rw-r--r--pw_span/OWNERS2
-rw-r--r--pw_spi/OWNERS2
-rw-r--r--pw_status/OWNERS2
-rw-r--r--pw_stm32cube_build/OWNERS2
-rw-r--r--pw_stream/OWNERS2
-rw-r--r--pw_string/OWNERS2
-rw-r--r--pw_symbolizer/OWNERS2
-rw-r--r--pw_sync/OWNERS2
-rw-r--r--pw_sync_baremetal/OWNERS2
-rw-r--r--pw_sync_embos/OWNERS2
-rw-r--r--pw_sync_freertos/OWNERS2
-rw-r--r--pw_sync_stl/OWNERS2
-rw-r--r--pw_sync_threadx/OWNERS2
-rw-r--r--pw_sync_zephyr/OWNERS2
-rw-r--r--pw_sys_io/OWNERS2
-rw-r--r--pw_sys_io_arduino/OWNERS2
-rw-r--r--pw_sys_io_baremetal_lm3s6965evb/OWNERS2
-rw-r--r--pw_sys_io_baremetal_stm32f429/OWNERS2
-rw-r--r--pw_sys_io_mcuxpresso/OWNERS2
-rw-r--r--pw_sys_io_stdio/OWNERS2
-rw-r--r--pw_sys_io_stm32cube/OWNERS2
-rw-r--r--pw_sys_io_zephyr/OWNERS2
-rw-r--r--pw_system/OWNERS2
-rw-r--r--pw_target_runner/OWNERS2
-rw-r--r--pw_thread/OWNERS2
-rw-r--r--pw_thread_embos/OWNERS2
-rw-r--r--pw_thread_freertos/OWNERS2
-rw-r--r--pw_thread_stl/OWNERS2
-rw-r--r--pw_thread_threadx/OWNERS2
-rw-r--r--pw_tls_client/OWNERS2
-rw-r--r--pw_tls_client_boringssl/OWNERS2
-rw-r--r--pw_tls_client_mbedtls/OWNERS2
-rw-r--r--pw_tokenizer/OWNERS2
-rw-r--r--pw_tool/OWNERS2
-rw-r--r--pw_toolchain/OWNERS2
-rw-r--r--pw_trace/OWNERS2
-rw-r--r--pw_trace_tokenized/OWNERS2
-rw-r--r--pw_transfer/OWNERS2
-rw-r--r--pw_unit_test/OWNERS2
-rw-r--r--pw_varint/OWNERS2
-rw-r--r--pw_watch/OWNERS2
-rw-r--r--pw_web/OWNERS2
-rw-r--r--pw_work_queue/OWNERS2
-rw-r--r--targets/android/OWNERS2
-rw-r--r--targets/arduino/OWNERS2
-rw-r--r--targets/docs/OWNERS2
-rw-r--r--targets/host/OWNERS2
-rw-r--r--targets/lm3s6965evb_qemu/OWNERS2
-rw-r--r--targets/stm32f429i_disc1/OWNERS2
-rw-r--r--third_party/arduino/OWNERS2
-rw-r--r--third_party/boringssl/OWNERS2
-rw-r--r--third_party/chromium_verifier/OWNERS2
-rw-r--r--third_party/embos/OWNERS2
-rw-r--r--third_party/freertos/OWNERS2
-rw-r--r--third_party/googletest/OWNERS2
-rw-r--r--third_party/mbedtls/OWNERS2
-rw-r--r--third_party/mcuxpresso/OWNERS2
-rw-r--r--third_party/micro_ecc/OWNERS2
-rw-r--r--third_party/nanopb/OWNERS2
-rw-r--r--third_party/protobuf/OWNERS2
-rw-r--r--third_party/stm32cube/OWNERS2
-rw-r--r--third_party/threadx/OWNERS2
-rw-r--r--third_party/tinyusb/OWNERS2
-rw-r--r--zephyr/OWNERS2
142 files changed, 285 insertions, 1 deletions
diff --git a/.vscode/OWNERS b/.vscode/OWNERS
index c5ffd1dc8..796bad2e4 100644
--- a/.vscode/OWNERS
+++ b/.vscode/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
chadnorvell@google.com
tonymd@google.com
+# keep-sorted: end
diff --git a/OWNERS b/OWNERS
index d106271ba..21477b1ec 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
+# keep-sorted: start
akirabaruah@google.com
alizhang@google.com
amontanez@google.com
@@ -15,3 +16,4 @@ pigweed-roller@pigweed.google.com.iam.gserviceaccount.com
tonymd@google.com
tpudlik@google.com
zyecheng@google.com
+# keep-sorted: end
diff --git a/pw_allocator/OWNERS b/pw_allocator/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_allocator/OWNERS
+++ b/pw_allocator/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_analog/OWNERS b/pw_analog/OWNERS
index 7ef129812..eec7fa27d 100644
--- a/pw_analog/OWNERS
+++ b/pw_analog/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
zengk@google.com
+# keep-sorted: end
diff --git a/pw_android_toolchain/OWNERS b/pw_android_toolchain/OWNERS
index c224618cd..3e8d9e6e9 100644
--- a/pw_android_toolchain/OWNERS
+++ b/pw_android_toolchain/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keybuk@google.com
+# keep-sorted: end
diff --git a/pw_arduino_build/OWNERS b/pw_arduino_build/OWNERS
index ca011e872..cd1d24e89 100644
--- a/pw_arduino_build/OWNERS
+++ b/pw_arduino_build/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
tonymd@google.com
+# keep-sorted: end
diff --git a/pw_assert/OWNERS b/pw_assert/OWNERS
index 252949512..6e5333aa3 100644
--- a/pw_assert/OWNERS
+++ b/pw_assert/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_assert_basic/OWNERS b/pw_assert_basic/OWNERS
index 252949512..6e5333aa3 100644
--- a/pw_assert_basic/OWNERS
+++ b/pw_assert_basic/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_assert_log/OWNERS b/pw_assert_log/OWNERS
index 252949512..6e5333aa3 100644
--- a/pw_assert_log/OWNERS
+++ b/pw_assert_log/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_assert_tokenized/OWNERS b/pw_assert_tokenized/OWNERS
index 5c77b8bf3..4336607d7 100644
--- a/pw_assert_tokenized/OWNERS
+++ b/pw_assert_tokenized/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
konkers@google.com
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_assert_zephyr/OWNERS b/pw_assert_zephyr/OWNERS
index 2230ec264..3ee1dfafe 100644
--- a/pw_assert_zephyr/OWNERS
+++ b/pw_assert_zephyr/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
peress@google.com
+# keep-sorted: end
diff --git a/pw_base64/OWNERS b/pw_base64/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_base64/OWNERS
+++ b/pw_base64/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_bloat/OWNERS b/pw_bloat/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_bloat/OWNERS
+++ b/pw_bloat/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_blob_store/OWNERS b/pw_blob_store/OWNERS
index 0ed2d4b27..f53320b9c 100644
--- a/pw_blob_store/OWNERS
+++ b/pw_blob_store/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
davidrogers@google.com
ewout@google.com
+# keep-sorted: end
diff --git a/pw_bluetooth_hci/OWNERS b/pw_bluetooth_hci/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/pw_bluetooth_hci/OWNERS
+++ b/pw_bluetooth_hci/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/pw_boot/OWNERS b/pw_boot/OWNERS
index 103db5cea..4634732aa 100644
--- a/pw_boot/OWNERS
+++ b/pw_boot/OWNERS
@@ -1,3 +1,5 @@
+# keep-sorted: start
amontanez@google.com
ewout@google.com
keybuk@google.com
+# keep-sorted: end
diff --git a/pw_boot_cortex_m/OWNERS b/pw_boot_cortex_m/OWNERS
index 103db5cea..4634732aa 100644
--- a/pw_boot_cortex_m/OWNERS
+++ b/pw_boot_cortex_m/OWNERS
@@ -1,3 +1,5 @@
+# keep-sorted: start
amontanez@google.com
ewout@google.com
keybuk@google.com
+# keep-sorted: end
diff --git a/pw_build/OWNERS b/pw_build/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_build/OWNERS
+++ b/pw_build/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_build_info/OWNERS b/pw_build_info/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_build_info/OWNERS
+++ b/pw_build_info/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_build_mcuxpresso/OWNERS b/pw_build_mcuxpresso/OWNERS
index c224618cd..3e8d9e6e9 100644
--- a/pw_build_mcuxpresso/OWNERS
+++ b/pw_build_mcuxpresso/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keybuk@google.com
+# keep-sorted: end
diff --git a/pw_bytes/OWNERS b/pw_bytes/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_bytes/OWNERS
+++ b/pw_bytes/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_checksum/OWNERS b/pw_checksum/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_checksum/OWNERS
+++ b/pw_checksum/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_chrono/OWNERS b/pw_chrono/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_chrono/OWNERS
+++ b/pw_chrono/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_chrono_embos/OWNERS b/pw_chrono_embos/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_chrono_embos/OWNERS
+++ b/pw_chrono_embos/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_chrono_freertos/OWNERS b/pw_chrono_freertos/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_chrono_freertos/OWNERS
+++ b/pw_chrono_freertos/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_chrono_stl/OWNERS b/pw_chrono_stl/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_chrono_stl/OWNERS
+++ b/pw_chrono_stl/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_chrono_threadx/OWNERS b/pw_chrono_threadx/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_chrono_threadx/OWNERS
+++ b/pw_chrono_threadx/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_chrono_zephyr/OWNERS b/pw_chrono_zephyr/OWNERS
index 2230ec264..3ee1dfafe 100644
--- a/pw_chrono_zephyr/OWNERS
+++ b/pw_chrono_zephyr/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
peress@google.com
+# keep-sorted: end
diff --git a/pw_cli/OWNERS b/pw_cli/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_cli/OWNERS
+++ b/pw_cli/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_console/OWNERS b/pw_console/OWNERS
index ca011e872..cd1d24e89 100644
--- a/pw_console/OWNERS
+++ b/pw_console/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
tonymd@google.com
+# keep-sorted: end
diff --git a/pw_containers/OWNERS b/pw_containers/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_containers/OWNERS
+++ b/pw_containers/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_cpu_exception/OWNERS b/pw_cpu_exception/OWNERS
index b09a54f50..3bdea23e0 100644
--- a/pw_cpu_exception/OWNERS
+++ b/pw_cpu_exception/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
ewout@google.com
+# keep-sorted: end
diff --git a/pw_cpu_exception_cortex_m/OWNERS b/pw_cpu_exception_cortex_m/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_cpu_exception_cortex_m/OWNERS
+++ b/pw_cpu_exception_cortex_m/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_crypto/OWNERS b/pw_crypto/OWNERS
index b01d16c5f..de6c537b8 100644
--- a/pw_crypto/OWNERS
+++ b/pw_crypto/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
alizhang@google.com
+# keep-sorted: end
diff --git a/pw_digital_io/OWNERS b/pw_digital_io/OWNERS
index dcdb6bdf8..47a718670 100644
--- a/pw_digital_io/OWNERS
+++ b/pw_digital_io/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amarkov@google.com
+# keep-sorted: end
diff --git a/pw_docgen/OWNERS b/pw_docgen/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_docgen/OWNERS
+++ b/pw_docgen/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_doctor/OWNERS b/pw_doctor/OWNERS
index c0fb30bf9..2fbba52b6 100644
--- a/pw_doctor/OWNERS
+++ b/pw_doctor/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
mohrr@google.com
+# keep-sorted: end
diff --git a/pw_env_setup/OWNERS b/pw_env_setup/OWNERS
index 792c5adf5..14371f036 100644
--- a/pw_env_setup/OWNERS
+++ b/pw_env_setup/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
jethier@google.com
mohrr@google.com
+# keep-sorted: end
diff --git a/pw_file/OWNERS b/pw_file/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_file/OWNERS
+++ b/pw_file/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_function/OWNERS b/pw_function/OWNERS
index 639b747c5..f4fe419ec 100644
--- a/pw_function/OWNERS
+++ b/pw_function/OWNERS
@@ -1,3 +1,5 @@
+# keep-sorted: start
amontanez@google.com
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_fuzzer/OWNERS b/pw_fuzzer/OWNERS
index 8819b2c20..2d296a211 100644
--- a/pw_fuzzer/OWNERS
+++ b/pw_fuzzer/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keir@google.com
+# keep-sorted: end
diff --git a/pw_hdlc/OWNERS b/pw_hdlc/OWNERS
index 34fbf1bf0..bc65641e2 100644
--- a/pw_hdlc/OWNERS
+++ b/pw_hdlc/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
frolv@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_hex_dump/OWNERS b/pw_hex_dump/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_hex_dump/OWNERS
+++ b/pw_hex_dump/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_i2c/OWNERS b/pw_i2c/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/pw_i2c/OWNERS
+++ b/pw_i2c/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/pw_i2c_mcuxpresso/OWNERS b/pw_i2c_mcuxpresso/OWNERS
index 504a930e5..ec4853855 100644
--- a/pw_i2c_mcuxpresso/OWNERS
+++ b/pw_i2c_mcuxpresso/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
-swatiwagh@google.com \ No newline at end of file
+swatiwagh@google.com
+# keep-sorted: end
diff --git a/pw_ide/OWNERS b/pw_ide/OWNERS
index c5ffd1dc8..796bad2e4 100644
--- a/pw_ide/OWNERS
+++ b/pw_ide/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
chadnorvell@google.com
tonymd@google.com
+# keep-sorted: end
diff --git a/pw_interrupt/OWNERS b/pw_interrupt/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/pw_interrupt/OWNERS
+++ b/pw_interrupt/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/pw_interrupt_cortex_m/OWNERS b/pw_interrupt_cortex_m/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/pw_interrupt_cortex_m/OWNERS
+++ b/pw_interrupt_cortex_m/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/pw_interrupt_zephyr/OWNERS b/pw_interrupt_zephyr/OWNERS
index 2230ec264..3ee1dfafe 100644
--- a/pw_interrupt_zephyr/OWNERS
+++ b/pw_interrupt_zephyr/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
peress@google.com
+# keep-sorted: end
diff --git a/pw_kvs/OWNERS b/pw_kvs/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_kvs/OWNERS
+++ b/pw_kvs/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_libc/OWNERS b/pw_libc/OWNERS
index 8819b2c20..2d296a211 100644
--- a/pw_libc/OWNERS
+++ b/pw_libc/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keir@google.com
+# keep-sorted: end
diff --git a/pw_log/OWNERS b/pw_log/OWNERS
index 05eeac994..ad8399d21 100644
--- a/pw_log/OWNERS
+++ b/pw_log/OWNERS
@@ -1,3 +1,5 @@
+# keep-sorted: start
frolv@google.com
hepler@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_log_basic/OWNERS b/pw_log_basic/OWNERS
index 05eeac994..ad8399d21 100644
--- a/pw_log_basic/OWNERS
+++ b/pw_log_basic/OWNERS
@@ -1,3 +1,5 @@
+# keep-sorted: start
frolv@google.com
hepler@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_log_null/OWNERS b/pw_log_null/OWNERS
index 05eeac994..ad8399d21 100644
--- a/pw_log_null/OWNERS
+++ b/pw_log_null/OWNERS
@@ -1,3 +1,5 @@
+# keep-sorted: start
frolv@google.com
hepler@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_log_rpc/OWNERS b/pw_log_rpc/OWNERS
index df7095dd1..033b16d9d 100644
--- a/pw_log_rpc/OWNERS
+++ b/pw_log_rpc/OWNERS
@@ -1,5 +1,7 @@
+# keep-sorted: start
cachinchilla@google.com
frolv@google.com
hepler@google.com
keir@google.com
prashanthsw@google.com
+# keep-sorted: end
diff --git a/pw_log_string/OWNERS b/pw_log_string/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_log_string/OWNERS
+++ b/pw_log_string/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_log_tokenized/OWNERS b/pw_log_tokenized/OWNERS
index 05eeac994..ad8399d21 100644
--- a/pw_log_tokenized/OWNERS
+++ b/pw_log_tokenized/OWNERS
@@ -1,3 +1,5 @@
+# keep-sorted: start
frolv@google.com
hepler@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_log_zephyr/OWNERS b/pw_log_zephyr/OWNERS
index 2230ec264..3ee1dfafe 100644
--- a/pw_log_zephyr/OWNERS
+++ b/pw_log_zephyr/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
peress@google.com
+# keep-sorted: end
diff --git a/pw_malloc/OWNERS b/pw_malloc/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_malloc/OWNERS
+++ b/pw_malloc/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_malloc_freelist/OWNERS b/pw_malloc_freelist/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_malloc_freelist/OWNERS
+++ b/pw_malloc_freelist/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_metric/OWNERS b/pw_metric/OWNERS
index 252949512..6e5333aa3 100644
--- a/pw_metric/OWNERS
+++ b/pw_metric/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_minimal_cpp_stdlib/OWNERS b/pw_minimal_cpp_stdlib/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_minimal_cpp_stdlib/OWNERS
+++ b/pw_minimal_cpp_stdlib/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_module/OWNERS b/pw_module/OWNERS
index 8819b2c20..2d296a211 100644
--- a/pw_module/OWNERS
+++ b/pw_module/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keir@google.com
+# keep-sorted: end
diff --git a/pw_multisink/OWNERS b/pw_multisink/OWNERS
index 2281d86f3..fa70966fc 100644
--- a/pw_multisink/OWNERS
+++ b/pw_multisink/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
prashanthsw@google.com
+# keep-sorted: end
diff --git a/pw_package/OWNERS b/pw_package/OWNERS
index c0fb30bf9..2fbba52b6 100644
--- a/pw_package/OWNERS
+++ b/pw_package/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
mohrr@google.com
+# keep-sorted: end
diff --git a/pw_persistent_ram/OWNERS b/pw_persistent_ram/OWNERS
index b09a54f50..3bdea23e0 100644
--- a/pw_persistent_ram/OWNERS
+++ b/pw_persistent_ram/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
ewout@google.com
+# keep-sorted: end
diff --git a/pw_polyfill/OWNERS b/pw_polyfill/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_polyfill/OWNERS
+++ b/pw_polyfill/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_preprocessor/OWNERS b/pw_preprocessor/OWNERS
index 34fbf1bf0..bc65641e2 100644
--- a/pw_preprocessor/OWNERS
+++ b/pw_preprocessor/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
frolv@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_presubmit/OWNERS b/pw_presubmit/OWNERS
index 73d84b4af..68c8b6f1b 100644
--- a/pw_presubmit/OWNERS
+++ b/pw_presubmit/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
hepler@google.com
mohrr@google.com
+# keep-sorted: end
diff --git a/pw_protobuf/OWNERS b/pw_protobuf/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_protobuf/OWNERS
+++ b/pw_protobuf/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_protobuf_compiler/OWNERS b/pw_protobuf_compiler/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_protobuf_compiler/OWNERS
+++ b/pw_protobuf_compiler/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_random/OWNERS b/pw_random/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_random/OWNERS
+++ b/pw_random/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_result/OWNERS b/pw_result/OWNERS
index b6d319c3b..0dddc2a04 100644
--- a/pw_result/OWNERS
+++ b/pw_result/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
frolv@google.com
+# keep-sorted: end
diff --git a/pw_ring_buffer/OWNERS b/pw_ring_buffer/OWNERS
index 50c89a749..93912dd23 100644
--- a/pw_ring_buffer/OWNERS
+++ b/pw_ring_buffer/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
keir@google.com
prashanthsw@google.com
+# keep-sorted: end
diff --git a/pw_router/OWNERS b/pw_router/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_router/OWNERS
+++ b/pw_router/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_rpc/OWNERS b/pw_rpc/OWNERS
index 34fbf1bf0..bc65641e2 100644
--- a/pw_rpc/OWNERS
+++ b/pw_rpc/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
frolv@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_snapshot/OWNERS b/pw_snapshot/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_snapshot/OWNERS
+++ b/pw_snapshot/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_software_update/OWNERS b/pw_software_update/OWNERS
index cec7abd59..41846d22c 100644
--- a/pw_software_update/OWNERS
+++ b/pw_software_update/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
alizhang@google.com
ewout@google.com
+# keep-sorted: end
diff --git a/pw_span/OWNERS b/pw_span/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_span/OWNERS
+++ b/pw_span/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_spi/OWNERS b/pw_spi/OWNERS
index 04a57fe85..3120843f9 100644
--- a/pw_spi/OWNERS
+++ b/pw_spi/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
markslevinsky@google.com
+# keep-sorted: end
diff --git a/pw_status/OWNERS b/pw_status/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_status/OWNERS
+++ b/pw_status/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_stm32cube_build/OWNERS b/pw_stm32cube_build/OWNERS
index fb4f20a18..f1df53a69 100644
--- a/pw_stm32cube_build/OWNERS
+++ b/pw_stm32cube_build/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
vars@google.com
+# keep-sorted: end
diff --git a/pw_stream/OWNERS b/pw_stream/OWNERS
index 4e07b1bf7..89e521186 100644
--- a/pw_stream/OWNERS
+++ b/pw_stream/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
davidrogers@google.com
+# keep-sorted: end
diff --git a/pw_string/OWNERS b/pw_string/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_string/OWNERS
+++ b/pw_string/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_symbolizer/OWNERS b/pw_symbolizer/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_symbolizer/OWNERS
+++ b/pw_symbolizer/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_sync/OWNERS b/pw_sync/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_sync/OWNERS
+++ b/pw_sync/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sync_baremetal/OWNERS b/pw_sync_baremetal/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_sync_baremetal/OWNERS
+++ b/pw_sync_baremetal/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sync_embos/OWNERS b/pw_sync_embos/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_sync_embos/OWNERS
+++ b/pw_sync_embos/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sync_freertos/OWNERS b/pw_sync_freertos/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_sync_freertos/OWNERS
+++ b/pw_sync_freertos/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sync_stl/OWNERS b/pw_sync_stl/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_sync_stl/OWNERS
+++ b/pw_sync_stl/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sync_threadx/OWNERS b/pw_sync_threadx/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_sync_threadx/OWNERS
+++ b/pw_sync_threadx/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sync_zephyr/OWNERS b/pw_sync_zephyr/OWNERS
index 2230ec264..3ee1dfafe 100644
--- a/pw_sync_zephyr/OWNERS
+++ b/pw_sync_zephyr/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
peress@google.com
+# keep-sorted: end
diff --git a/pw_sys_io/OWNERS b/pw_sys_io/OWNERS
index 87739626a..4db1b8da1 100644
--- a/pw_sys_io/OWNERS
+++ b/pw_sys_io/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sys_io_arduino/OWNERS b/pw_sys_io_arduino/OWNERS
index 87739626a..4db1b8da1 100644
--- a/pw_sys_io_arduino/OWNERS
+++ b/pw_sys_io_arduino/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sys_io_baremetal_lm3s6965evb/OWNERS b/pw_sys_io_baremetal_lm3s6965evb/OWNERS
index 87739626a..4db1b8da1 100644
--- a/pw_sys_io_baremetal_lm3s6965evb/OWNERS
+++ b/pw_sys_io_baremetal_lm3s6965evb/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sys_io_baremetal_stm32f429/OWNERS b/pw_sys_io_baremetal_stm32f429/OWNERS
index 87739626a..4db1b8da1 100644
--- a/pw_sys_io_baremetal_stm32f429/OWNERS
+++ b/pw_sys_io_baremetal_stm32f429/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sys_io_mcuxpresso/OWNERS b/pw_sys_io_mcuxpresso/OWNERS
index 87739626a..4db1b8da1 100644
--- a/pw_sys_io_mcuxpresso/OWNERS
+++ b/pw_sys_io_mcuxpresso/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sys_io_stdio/OWNERS b/pw_sys_io_stdio/OWNERS
index 87739626a..4db1b8da1 100644
--- a/pw_sys_io_stdio/OWNERS
+++ b/pw_sys_io_stdio/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
amontanez@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_sys_io_stm32cube/OWNERS b/pw_sys_io_stm32cube/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/pw_sys_io_stm32cube/OWNERS
+++ b/pw_sys_io_stm32cube/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/pw_sys_io_zephyr/OWNERS b/pw_sys_io_zephyr/OWNERS
index 2230ec264..3ee1dfafe 100644
--- a/pw_sys_io_zephyr/OWNERS
+++ b/pw_sys_io_zephyr/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
peress@google.com
+# keep-sorted: end
diff --git a/pw_system/OWNERS b/pw_system/OWNERS
index 621c5820d..b74dcda1c 100644
--- a/pw_system/OWNERS
+++ b/pw_system/OWNERS
@@ -1,4 +1,6 @@
+# keep-sorted: start
amontanez@google.com
cachinchilla@google.com
keir@google.com
tonymd@google.com
+# keep-sorted: end
diff --git a/pw_target_runner/OWNERS b/pw_target_runner/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_target_runner/OWNERS
+++ b/pw_target_runner/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_thread/OWNERS b/pw_thread/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_thread/OWNERS
+++ b/pw_thread/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_thread_embos/OWNERS b/pw_thread_embos/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_thread_embos/OWNERS
+++ b/pw_thread_embos/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_thread_freertos/OWNERS b/pw_thread_freertos/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_thread_freertos/OWNERS
+++ b/pw_thread_freertos/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_thread_stl/OWNERS b/pw_thread_stl/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_thread_stl/OWNERS
+++ b/pw_thread_stl/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_thread_threadx/OWNERS b/pw_thread_threadx/OWNERS
index e9a6c5813..482b3dfb1 100644
--- a/pw_thread_threadx/OWNERS
+++ b/pw_thread_threadx/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
ewout@google.com
hepler@google.com
+# keep-sorted: end
diff --git a/pw_tls_client/OWNERS b/pw_tls_client/OWNERS
index 121c6f5aa..b3db9b4a2 100644
--- a/pw_tls_client/OWNERS
+++ b/pw_tls_client/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
zyecheng@google.com
+# keep-sorted: end
diff --git a/pw_tls_client_boringssl/OWNERS b/pw_tls_client_boringssl/OWNERS
index 121c6f5aa..b3db9b4a2 100644
--- a/pw_tls_client_boringssl/OWNERS
+++ b/pw_tls_client_boringssl/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
zyecheng@google.com
+# keep-sorted: end
diff --git a/pw_tls_client_mbedtls/OWNERS b/pw_tls_client_mbedtls/OWNERS
index 121c6f5aa..b3db9b4a2 100644
--- a/pw_tls_client_mbedtls/OWNERS
+++ b/pw_tls_client_mbedtls/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
zyecheng@google.com
+# keep-sorted: end
diff --git a/pw_tokenizer/OWNERS b/pw_tokenizer/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_tokenizer/OWNERS
+++ b/pw_tokenizer/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_tool/OWNERS b/pw_tool/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_tool/OWNERS
+++ b/pw_tool/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_toolchain/OWNERS b/pw_toolchain/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_toolchain/OWNERS
+++ b/pw_toolchain/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_trace/OWNERS b/pw_trace/OWNERS
index 8819b2c20..2d296a211 100644
--- a/pw_trace/OWNERS
+++ b/pw_trace/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keir@google.com
+# keep-sorted: end
diff --git a/pw_trace_tokenized/OWNERS b/pw_trace_tokenized/OWNERS
index 8819b2c20..2d296a211 100644
--- a/pw_trace_tokenized/OWNERS
+++ b/pw_trace_tokenized/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keir@google.com
+# keep-sorted: end
diff --git a/pw_transfer/OWNERS b/pw_transfer/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/pw_transfer/OWNERS
+++ b/pw_transfer/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/pw_unit_test/OWNERS b/pw_unit_test/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_unit_test/OWNERS
+++ b/pw_unit_test/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_varint/OWNERS b/pw_varint/OWNERS
index 3afb92601..6c1778679 100644
--- a/pw_varint/OWNERS
+++ b/pw_varint/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/pw_watch/OWNERS b/pw_watch/OWNERS
index 4462823cf..0a8dde62f 100644
--- a/pw_watch/OWNERS
+++ b/pw_watch/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
hepler@google.com
keir@google.com
+# keep-sorted: end
diff --git a/pw_web/OWNERS b/pw_web/OWNERS
index e69de29bb..c2510f482 100644
--- a/pw_web/OWNERS
+++ b/pw_web/OWNERS
@@ -0,0 +1,2 @@
+# keep-sorted: start
+# keep-sorted: end
diff --git a/pw_work_queue/OWNERS b/pw_work_queue/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/pw_work_queue/OWNERS
+++ b/pw_work_queue/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/targets/android/OWNERS b/targets/android/OWNERS
index c224618cd..3e8d9e6e9 100644
--- a/targets/android/OWNERS
+++ b/targets/android/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keybuk@google.com
+# keep-sorted: end
diff --git a/targets/arduino/OWNERS b/targets/arduino/OWNERS
index ca011e872..cd1d24e89 100644
--- a/targets/arduino/OWNERS
+++ b/targets/arduino/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
tonymd@google.com
+# keep-sorted: end
diff --git a/targets/docs/OWNERS b/targets/docs/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/targets/docs/OWNERS
+++ b/targets/docs/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/targets/host/OWNERS b/targets/host/OWNERS
index d96cbc68d..ff1c981ec 100644
--- a/targets/host/OWNERS
+++ b/targets/host/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
hepler@google.com
+# keep-sorted: end
diff --git a/targets/lm3s6965evb_qemu/OWNERS b/targets/lm3s6965evb_qemu/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/targets/lm3s6965evb_qemu/OWNERS
+++ b/targets/lm3s6965evb_qemu/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/targets/stm32f429i_disc1/OWNERS b/targets/stm32f429i_disc1/OWNERS
index 307b1deb5..ece6e36bb 100644
--- a/targets/stm32f429i_disc1/OWNERS
+++ b/targets/stm32f429i_disc1/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
amontanez@google.com
+# keep-sorted: end
diff --git a/third_party/arduino/OWNERS b/third_party/arduino/OWNERS
index ca011e872..cd1d24e89 100644
--- a/third_party/arduino/OWNERS
+++ b/third_party/arduino/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
tonymd@google.com
+# keep-sorted: end
diff --git a/third_party/boringssl/OWNERS b/third_party/boringssl/OWNERS
index 121c6f5aa..b3db9b4a2 100644
--- a/third_party/boringssl/OWNERS
+++ b/third_party/boringssl/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
zyecheng@google.com
+# keep-sorted: end
diff --git a/third_party/chromium_verifier/OWNERS b/third_party/chromium_verifier/OWNERS
index 121c6f5aa..b3db9b4a2 100644
--- a/third_party/chromium_verifier/OWNERS
+++ b/third_party/chromium_verifier/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
zyecheng@google.com
+# keep-sorted: end
diff --git a/third_party/embos/OWNERS b/third_party/embos/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/third_party/embos/OWNERS
+++ b/third_party/embos/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/third_party/freertos/OWNERS b/third_party/freertos/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/third_party/freertos/OWNERS
+++ b/third_party/freertos/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/third_party/googletest/OWNERS b/third_party/googletest/OWNERS
index 4653415d5..3af96d220 100644
--- a/third_party/googletest/OWNERS
+++ b/third_party/googletest/OWNERS
@@ -1,2 +1,4 @@
+# keep-sorted: start
mohrr@google.com
zengk@google.com
+# keep-sorted: end
diff --git a/third_party/mbedtls/OWNERS b/third_party/mbedtls/OWNERS
index 121c6f5aa..b3db9b4a2 100644
--- a/third_party/mbedtls/OWNERS
+++ b/third_party/mbedtls/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
zyecheng@google.com
+# keep-sorted: end
diff --git a/third_party/mcuxpresso/OWNERS b/third_party/mcuxpresso/OWNERS
index c224618cd..3e8d9e6e9 100644
--- a/third_party/mcuxpresso/OWNERS
+++ b/third_party/mcuxpresso/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
keybuk@google.com
+# keep-sorted: end
diff --git a/third_party/micro_ecc/OWNERS b/third_party/micro_ecc/OWNERS
index b01d16c5f..de6c537b8 100644
--- a/third_party/micro_ecc/OWNERS
+++ b/third_party/micro_ecc/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
alizhang@google.com
+# keep-sorted: end
diff --git a/third_party/nanopb/OWNERS b/third_party/nanopb/OWNERS
index 3afb92601..6c1778679 100644
--- a/third_party/nanopb/OWNERS
+++ b/third_party/nanopb/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/third_party/protobuf/OWNERS b/third_party/protobuf/OWNERS
index 3afb92601..6c1778679 100644
--- a/third_party/protobuf/OWNERS
+++ b/third_party/protobuf/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
frolv@google.com
+# keep-sorted: end
diff --git a/third_party/stm32cube/OWNERS b/third_party/stm32cube/OWNERS
index fb4f20a18..f1df53a69 100644
--- a/third_party/stm32cube/OWNERS
+++ b/third_party/stm32cube/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
vars@google.com
+# keep-sorted: end
diff --git a/third_party/threadx/OWNERS b/third_party/threadx/OWNERS
index 21d24bca7..70f6cdc2a 100644
--- a/third_party/threadx/OWNERS
+++ b/third_party/threadx/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
ewout@google.com
+# keep-sorted: end
diff --git a/third_party/tinyusb/OWNERS b/third_party/tinyusb/OWNERS
index a39ed4484..f11412cf9 100644
--- a/third_party/tinyusb/OWNERS
+++ b/third_party/tinyusb/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
deymo@google.com
+# keep-sorted: end
diff --git a/zephyr/OWNERS b/zephyr/OWNERS
index 2230ec264..3ee1dfafe 100644
--- a/zephyr/OWNERS
+++ b/zephyr/OWNERS
@@ -1 +1,3 @@
+# keep-sorted: start
peress@google.com
+# keep-sorted: end