Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/.style.yapf b/.style.yapf
index 269576a..3c92d7b 100644
--- a/.style.yapf
+++ b/.style.yapf
@@ -1,5 +1,5 @@
 [style]
-based_on_style = chromium
+based_on_style = yapf
 
 # Full list of knobs: https://github.com/google/yapf#knobs
 split_before_first_argument = true