diff --git a/activity/activity/api/api_lint.ignore b/activity/activity/api/api_lint.ignore
index 64382c3..d22641b 100644
--- a/activity/activity/api/api_lint.ignore
+++ b/activity/activity/api/api_lint.ignore
@@ -1,12 +1,12 @@
 // Baseline format: 1.0
-CallbackMethodName: androidx.activity.OnBackPressedCallback:
-    Callback method names must follow the on<Something> style: setEnabled
-
-
 ForbiddenSuperClass: androidx.activity.ComponentActivity:
     ComponentActivity should not extend `Activity`. Activity subclasses are impossible to compose. Expose a composable API instead.
 
 
+KotlinOperator: androidx.activity.result.ActivityResultRegistry#invoke(int, androidx.activity.result.contract.ActivityResultContract<I,O>, I, androidx.core.app.ActivityOptionsCompat):
+    Method can be invoked with function call syntax from Kotlin: `invoke` (this is usually desirable; just make sure it makes sense for this type of object)
+
+
 MissingNullability: androidx.activity.ComponentActivity#startActivityForResult(android.content.Intent, int) parameter #0:
     Missing nullability on parameter `intent` in method `startActivityForResult`
 MissingNullability: androidx.activity.ComponentActivity#startActivityForResult(android.content.Intent, int, android.os.Bundle) parameter #0:
diff --git a/appcompat/appcompat/api/api_lint.ignore b/appcompat/appcompat/api/api_lint.ignore
index 039f065..fd01b04 100644
--- a/appcompat/appcompat/api/api_lint.ignore
+++ b/appcompat/appcompat/api/api_lint.ignore
@@ -17,6 +17,12 @@
     Use ListenableFuture (library), or a combination of Consumer<T>, Executor, and CancellationSignal (platform) instead of java.util.concurrent.Future (parameter future in androidx.appcompat.widget.AppCompatTextView.setTextFuture(java.util.concurrent.Future<androidx.core.text.PrecomputedTextCompat> future))
 
 
+BuilderSetStyle: androidx.appcompat.app.AlertDialog.Builder#create():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.appcompat.app.AlertDialog.Builder.create()
+BuilderSetStyle: androidx.appcompat.app.AlertDialog.Builder#show():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.appcompat.app.AlertDialog.Builder.show()
+
+
 ContextFirst: androidx.appcompat.app.AppCompatDelegate#createView(android.view.View, String, android.content.Context, android.util.AttributeSet) parameter #2:
     Context is distinct, so it must be the first argument (method `createView`)
 
diff --git a/autofill/autofill/api/api_lint.ignore b/autofill/autofill/api/api_lint.ignore
new file mode 100644
index 0000000..d0b566f
--- /dev/null
+++ b/autofill/autofill/api/api_lint.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+SetterReturnsThis: androidx.autofill.inline.UiVersions.StylesBuilder#addStyle(androidx.autofill.inline.UiVersions.Style):
+    Methods must return the builder object (return type androidx.autofill.inline.UiVersions.StylesBuilder instead of void): method androidx.autofill.inline.UiVersions.StylesBuilder.addStyle(androidx.autofill.inline.UiVersions.Style)
diff --git a/browser/browser/api/api_lint.ignore b/browser/browser/api/api_lint.ignore
index b23baec..a4d5f5e 100644
--- a/browser/browser/api/api_lint.ignore
+++ b/browser/browser/api/api_lint.ignore
@@ -57,8 +57,10 @@
     Must avoid boxed primitives (`java.lang.Integer`)
 
 
-CallbackMethodName: androidx.browser.customtabs.CustomTabsCallback:
-    Callback method names must follow the on<Something> style: extraCallback
+BuilderSetStyle: androidx.browser.customtabs.CustomTabsIntent.Builder#enableUrlBarHiding():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.browser.customtabs.CustomTabsIntent.Builder.enableUrlBarHiding()
+BuilderSetStyle: androidx.browser.trusted.TrustedWebActivityIntentBuilder#buildCustomTabsIntent():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.browser.trusted.TrustedWebActivityIntentBuilder.buildCustomTabsIntent()
 
 
 ConcreteCollection: androidx.browser.browseractions.BrowserActionsIntent#openBrowserAction(android.content.Context, android.net.Uri, int, java.util.ArrayList<androidx.browser.browseractions.BrowserActionItem>, android.app.PendingIntent) parameter #3:
@@ -77,6 +79,10 @@
     Listeners should always be at end of argument list (method `newSession`)
 
 
+OptionalBuilderConstructorAgrument: androidx.browser.customtabs.CustomTabsIntent.Builder#Builder(androidx.browser.customtabs.CustomTabsSession) parameter #0:
+    Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter session in androidx.browser.customtabs.CustomTabsIntent.Builder(androidx.browser.customtabs.CustomTabsSession session)
+
+
 PublicTypedef: androidx.browser.customtabs.CustomTabsService.Relation:
     Don't expose @IntDef: Relation must be hidden.
 PublicTypedef: androidx.browser.customtabs.CustomTabsService.Result:
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
index 3580d2a..161803c 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
@@ -112,6 +112,10 @@
         "NotCloseable",
         "SamShouldBeLast",
         "MissingJvmstatic",
+        "CallbackMethodName",
+        "GetterOnBuilder",
+        "StaticFinalBuilder",
+        "MissingGetterMatchingBuilder",
 
         // We should only treat these as warnings
         "IntentBuilderName",
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt
index 06b03c5..04120e0 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/UpdateBaselineTasks.kt
@@ -132,6 +132,8 @@
             baselineFile
         )
         args += listOf(
+            "--baseline",
+            baselineFile.toString(),
             "--check-compatibility:api:released",
             prevApi.toString(),
             "--source-files",
@@ -171,7 +173,6 @@
     return mutableListOf(
         "--update-baseline",
         baselineFile.toString(),
-        "--baseline", baselineFile.toString(),
         "--pass-baseline-updates",
         "--delete-empty-baselines",
         "--format=v3",
diff --git a/camera/camera-core/api/api_lint.ignore b/camera/camera-core/api/api_lint.ignore
index 075bc7c..71e1926 100644
--- a/camera/camera-core/api/api_lint.ignore
+++ b/camera/camera-core/api/api_lint.ignore
@@ -1,3 +1,11 @@
 // Baseline format: 1.0
+BuilderSetStyle: androidx.camera.core.CameraSelector.Builder#requireLensFacing(int):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.camera.core.CameraSelector.Builder.requireLensFacing(int)
+BuilderSetStyle: androidx.camera.core.CameraXConfig.Builder#fromConfig(androidx.camera.core.CameraXConfig):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.camera.core.CameraXConfig.Builder.fromConfig(androidx.camera.core.CameraXConfig)
+BuilderSetStyle: androidx.camera.core.FocusMeteringAction.Builder#disableAutoCancel():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.camera.core.FocusMeteringAction.Builder.disableAutoCancel()
+
+
 TopLevelBuilder: androidx.camera.core.ExtendableBuilder:
     Builder should be defined as inner class: androidx.camera.core.ExtendableBuilder
diff --git a/core/core-animation/api/api_lint.ignore b/core/core-animation/api/api_lint.ignore
index 3b4ea75..70743c5 100644
--- a/core/core-animation/api/api_lint.ignore
+++ b/core/core-animation/api/api_lint.ignore
@@ -1,3 +1,9 @@
 // Baseline format: 1.0
+BuilderSetStyle: androidx.core.animation.AnimatorSet.Builder#after(androidx.core.animation.Animator):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.animation.AnimatorSet.Builder.after(androidx.core.animation.Animator)
+BuilderSetStyle: androidx.core.animation.AnimatorSet.Builder#after(long):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.animation.AnimatorSet.Builder.after(long)
+BuilderSetStyle: androidx.core.animation.AnimatorSet.Builder#before(androidx.core.animation.Animator):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.animation.AnimatorSet.Builder.before(androidx.core.animation.Animator)
 BuilderSetStyle: androidx.core.animation.AnimatorSet.Builder#with(androidx.core.animation.Animator):
-    Builder methods names should use setFoo() style: method androidx.core.animation.AnimatorSet.Builder.with(androidx.core.animation.Animator)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.animation.AnimatorSet.Builder.with(androidx.core.animation.Animator)
diff --git a/core/core/api/api_lint.ignore b/core/core/api/api_lint.ignore
index 22a5a1e..825c810 100644
--- a/core/core/api/api_lint.ignore
+++ b/core/core/api/api_lint.ignore
@@ -205,6 +205,30 @@
     Methods must not mention RuntimeException subclasses in throws clauses (was `java.lang.IllegalArgumentException`)
 
 
+BuilderSetStyle: androidx.core.app.NotificationCompat.Action.Builder#extend(androidx.core.app.NotificationCompat.Action.Extender):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.NotificationCompat.Action.Builder.extend(androidx.core.app.NotificationCompat.Action.Extender)
+BuilderSetStyle: androidx.core.app.NotificationCompat.Builder#extend(androidx.core.app.NotificationCompat.Extender):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.NotificationCompat.Builder.extend(androidx.core.app.NotificationCompat.Extender)
+BuilderSetStyle: androidx.core.app.NotificationCompat.Builder#limitCharSequenceLength(CharSequence):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.NotificationCompat.Builder.limitCharSequenceLength(CharSequence)
+BuilderSetStyle: androidx.core.app.ShareCompat.IntentBuilder#createChooserIntent():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.ShareCompat.IntentBuilder.createChooserIntent()
+BuilderSetStyle: androidx.core.app.ShareCompat.IntentBuilder#from(android.app.Activity):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.ShareCompat.IntentBuilder.from(android.app.Activity)
+BuilderSetStyle: androidx.core.app.ShareCompat.IntentBuilder#startChooser():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.ShareCompat.IntentBuilder.startChooser()
+BuilderSetStyle: androidx.core.app.TaskStackBuilder#create(android.content.Context):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.TaskStackBuilder.create(android.content.Context)
+BuilderSetStyle: androidx.core.app.TaskStackBuilder#editIntentAt(int):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.TaskStackBuilder.editIntentAt(int)
+BuilderSetStyle: androidx.core.app.TaskStackBuilder#startActivities():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.TaskStackBuilder.startActivities()
+BuilderSetStyle: androidx.core.app.TaskStackBuilder#startActivities(android.os.Bundle):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.app.TaskStackBuilder.startActivities(android.os.Bundle)
+BuilderSetStyle: androidx.core.text.BidiFormatter.Builder#stereoReset(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.core.text.BidiFormatter.Builder.stereoReset(boolean)
+
+
 ContextFirst: androidx.core.view.LayoutInflaterFactory#onCreateView(android.view.View, String, android.content.Context, android.util.AttributeSet) parameter #2:
     Context is distinct, so it must be the first argument (method `onCreateView`)
 ContextFirst: androidx.core.view.ViewConfigurationCompat#getScaledHorizontalScrollFactor(android.view.ViewConfiguration, android.content.Context) parameter #1:
@@ -2089,6 +2113,14 @@
     Provide an explicit copy constructor instead of implementing `clone()`
 
 
+OptionalBuilderConstructorAgrument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #0:
+    Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter icon in androidx.core.app.NotificationCompat.Action.Builder(androidx.core.graphics.drawable.IconCompat icon, CharSequence title, android.app.PendingIntent intent)
+OptionalBuilderConstructorAgrument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #1:
+    Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter title in androidx.core.app.NotificationCompat.Action.Builder(androidx.core.graphics.drawable.IconCompat icon, CharSequence title, android.app.PendingIntent intent)
+OptionalBuilderConstructorAgrument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #2:
+    Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter intent in androidx.core.app.NotificationCompat.Action.Builder(androidx.core.graphics.drawable.IconCompat icon, CharSequence title, android.app.PendingIntent intent)
+
+
 PairedRegistration: androidx.core.view.OneShotPreDrawListener#removeListener():
     Found removeListener but not addListener in androidx.core.view.OneShotPreDrawListener
 
diff --git a/customview/customview/api/api_lint.ignore b/customview/customview/api/api_lint.ignore
index e3d334f..ba85783 100644
--- a/customview/customview/api/api_lint.ignore
+++ b/customview/customview/api/api_lint.ignore
@@ -1,8 +1,4 @@
 // Baseline format: 1.0
-CallbackMethodName: androidx.customview.widget.ViewDragHelper.Callback:
-    Callback method names must follow the on<Something> style: getOrderedChildIndex
-
-
 MissingNullability: androidx.customview.view.AbsSavedState#CREATOR:
     Missing nullability on field `CREATOR` in class `class androidx.customview.view.AbsSavedState`
 MissingNullability: androidx.customview.view.AbsSavedState#EMPTY_STATE:
diff --git a/datastore/datastore-preferences/api/api_lint.ignore b/datastore/datastore-preferences/api/api_lint.ignore
new file mode 100644
index 0000000..2890439
--- /dev/null
+++ b/datastore/datastore-preferences/api/api_lint.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+BuilderSetStyle: androidx.datastore.preferences.Preferences.Builder#remove(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.datastore.preferences.Preferences.Builder.remove(String)
diff --git a/fragment/fragment/api/api_lint.ignore b/fragment/fragment/api/api_lint.ignore
index 3f1f664..0268087 100644
--- a/fragment/fragment/api/api_lint.ignore
+++ b/fragment/fragment/api/api_lint.ignore
@@ -27,18 +27,10 @@
     Missing nullability on parameter `intent` in method `startIntentSenderForResult`
 MissingNullability: androidx.fragment.app.FragmentActivity#onNewIntent(android.content.Intent) parameter #0:
     Missing nullability on parameter `intent` in method `onNewIntent`
-MissingNullability: androidx.fragment.app.FragmentActivity#startActivityForResult(android.content.Intent, int) parameter #0:
-    Missing nullability on parameter `intent` in method `startActivityForResult`
-MissingNullability: androidx.fragment.app.FragmentActivity#startActivityForResult(android.content.Intent, int, android.os.Bundle) parameter #0:
-    Missing nullability on parameter `intent` in method `startActivityForResult`
 MissingNullability: androidx.fragment.app.FragmentActivity#startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent, int) parameter #1:
     Missing nullability on parameter `intent` in method `startActivityFromFragment`
 MissingNullability: androidx.fragment.app.FragmentActivity#startActivityFromFragment(androidx.fragment.app.Fragment, android.content.Intent, int, android.os.Bundle) parameter #1:
     Missing nullability on parameter `intent` in method `startActivityFromFragment`
-MissingNullability: androidx.fragment.app.FragmentActivity#startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int) parameter #0:
-    Missing nullability on parameter `intent` in method `startIntentSenderForResult`
-MissingNullability: androidx.fragment.app.FragmentActivity#startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) parameter #0:
-    Missing nullability on parameter `intent` in method `startIntentSenderForResult`
 MissingNullability: androidx.fragment.app.FragmentActivity#startIntentSenderFromFragment(androidx.fragment.app.Fragment, android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) parameter #1:
     Missing nullability on parameter `intent` in method `startIntentSenderFromFragment`
 MissingNullability: androidx.fragment.app.FragmentController#getActiveFragments(java.util.List<androidx.fragment.app.Fragment>) parameter #0:
diff --git a/leanback/leanback/api/api_lint.ignore b/leanback/leanback/api/api_lint.ignore
index 32f2b54..1eea158 100644
--- a/leanback/leanback/api/api_lint.ignore
+++ b/leanback/leanback/api/api_lint.ignore
@@ -53,12 +53,18 @@
     Must avoid boxed primitives (`java.lang.Number`)
 
 
-CallbackMethodName: androidx.leanback.widget.DiffCallback:
-    Callback method names must follow the on<Something> style: areItemsTheSame
-CallbackMethodName: androidx.leanback.widget.GuidedActionDiffCallback:
-    Callback method names must follow the on<Something> style: getInstance
-CallbackMethodName: androidx.leanback.widget.SearchBar.SearchBarPermissionListener:
-    Listener method names must follow the on<Something> style: requestAudioPermission
+BuilderSetStyle: androidx.leanback.widget.ShadowOverlayHelper.Builder#keepForegroundDrawable(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.leanback.widget.ShadowOverlayHelper.Builder.keepForegroundDrawable(boolean)
+BuilderSetStyle: androidx.leanback.widget.ShadowOverlayHelper.Builder#needsOverlay(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.leanback.widget.ShadowOverlayHelper.Builder.needsOverlay(boolean)
+BuilderSetStyle: androidx.leanback.widget.ShadowOverlayHelper.Builder#needsRoundedCorner(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.leanback.widget.ShadowOverlayHelper.Builder.needsRoundedCorner(boolean)
+BuilderSetStyle: androidx.leanback.widget.ShadowOverlayHelper.Builder#needsShadow(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.leanback.widget.ShadowOverlayHelper.Builder.needsShadow(boolean)
+BuilderSetStyle: androidx.leanback.widget.ShadowOverlayHelper.Builder#options(androidx.leanback.widget.ShadowOverlayHelper.Options):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.leanback.widget.ShadowOverlayHelper.Builder.options(androidx.leanback.widget.ShadowOverlayHelper.Options)
+BuilderSetStyle: androidx.leanback.widget.ShadowOverlayHelper.Builder#preferZOrder(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.leanback.widget.ShadowOverlayHelper.Builder.preferZOrder(boolean)
 
 
 CallbackName: androidx.leanback.widget.ObjectAdapter.DataObserver:
diff --git a/media/media/api/api_lint.ignore b/media/media/api/api_lint.ignore
index 6e997641..fe4b00a 100644
--- a/media/media/api/api_lint.ignore
+++ b/media/media/api/api_lint.ignore
@@ -21,8 +21,16 @@
     Inconsistent extra value; expected `androidx.media.extra.SUGGESTED`, was `android.service.media.extra.SUGGESTED`
 
 
-CallbackMethodName: android.support.v4.media.session.MediaControllerCompat.Callback:
-    Callback method names must follow the on<Something> style: binderDied
+BuilderSetStyle: android.support.v4.media.MediaMetadataCompat.Builder#putBitmap(String, android.graphics.Bitmap):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.support.v4.media.MediaMetadataCompat.Builder.putBitmap(String,android.graphics.Bitmap)
+BuilderSetStyle: android.support.v4.media.MediaMetadataCompat.Builder#putLong(String, long):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.support.v4.media.MediaMetadataCompat.Builder.putLong(String,long)
+BuilderSetStyle: android.support.v4.media.MediaMetadataCompat.Builder#putRating(String, android.support.v4.media.RatingCompat):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.support.v4.media.MediaMetadataCompat.Builder.putRating(String,android.support.v4.media.RatingCompat)
+BuilderSetStyle: android.support.v4.media.MediaMetadataCompat.Builder#putString(String, String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.support.v4.media.MediaMetadataCompat.Builder.putString(String,String)
+BuilderSetStyle: android.support.v4.media.MediaMetadataCompat.Builder#putText(String, CharSequence):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.support.v4.media.MediaMetadataCompat.Builder.putText(String,CharSequence)
 
 
 ContextNameSuffix: androidx.media.MediaBrowserServiceCompat:
diff --git a/media2/common/api/api_lint.ignore b/media2/common/api/api_lint.ignore
index 35e4147..d2bb9aa 100644
--- a/media2/common/api/api_lint.ignore
+++ b/media2/common/api/api_lint.ignore
@@ -1,6 +1,16 @@
 // Baseline format: 1.0
-CallbackMethodName: androidx.media2.common.DataSourceCallback:
-    Callback method names must follow the on<Something> style: readAt
+BuilderSetStyle: androidx.media2.common.MediaMetadata.Builder#putBitmap(String, android.graphics.Bitmap):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.common.MediaMetadata.Builder.putBitmap(String,android.graphics.Bitmap)
+BuilderSetStyle: androidx.media2.common.MediaMetadata.Builder#putFloat(String, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.common.MediaMetadata.Builder.putFloat(String,float)
+BuilderSetStyle: androidx.media2.common.MediaMetadata.Builder#putLong(String, long):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.common.MediaMetadata.Builder.putLong(String,long)
+BuilderSetStyle: androidx.media2.common.MediaMetadata.Builder#putRating(String, androidx.media2.common.Rating):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.common.MediaMetadata.Builder.putRating(String,androidx.media2.common.Rating)
+BuilderSetStyle: androidx.media2.common.MediaMetadata.Builder#putString(String, String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.common.MediaMetadata.Builder.putString(String,String)
+BuilderSetStyle: androidx.media2.common.MediaMetadata.Builder#putText(String, CharSequence):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.common.MediaMetadata.Builder.putText(String,CharSequence)
 
 
 GenericException: androidx.media2.common.SessionPlayer#close():
diff --git a/media2/session/api/api_lint.ignore b/media2/session/api/api_lint.ignore
index ac1c632..9ae568a 100644
--- a/media2/session/api/api_lint.ignore
+++ b/media2/session/api/api_lint.ignore
@@ -5,6 +5,10 @@
     Use ListenableFuture (library), or a combination of Consumer<T>, Executor, and CancellationSignal (platform) instead of java.util.concurrent.Future (method androidx.media2.session.RemoteSessionPlayer.setVolume(int))
 
 
+BuilderSetStyle: androidx.media2.session.SessionCommandGroup.Builder#removeCommand(androidx.media2.session.SessionCommand):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.session.SessionCommandGroup.Builder.removeCommand(androidx.media2.session.SessionCommand)
+
+
 MissingNullability: androidx.media2.session.MediaLibraryService#onBind(android.content.Intent):
     Missing nullability on method `onBind` return
 MissingNullability: androidx.media2.session.MediaSessionService#onStartCommand(android.content.Intent, int, int) parameter #0:
diff --git a/navigation/navigation-common-ktx/api/api_lint.ignore b/navigation/navigation-common-ktx/api/api_lint.ignore
index 6ba701d..82360c9 100644
--- a/navigation/navigation-common-ktx/api/api_lint.ignore
+++ b/navigation/navigation-common-ktx/api/api_lint.ignore
@@ -1,4 +1,20 @@
 // Baseline format: 1.0
+BuilderSetStyle: androidx.navigation.NavActionBuilder#navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavActionBuilder.navOptions(kotlin.jvm.functions.Function1<? super androidx.navigation.NavOptionsBuilder,kotlin.Unit>)
+BuilderSetStyle: androidx.navigation.NavDestinationBuilder#action(int, kotlin.jvm.functions.Function1<? super androidx.navigation.NavActionBuilder,kotlin.Unit>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDestinationBuilder.action(int,kotlin.jvm.functions.Function1<? super androidx.navigation.NavActionBuilder,kotlin.Unit>)
+BuilderSetStyle: androidx.navigation.NavDestinationBuilder#argument(String, kotlin.jvm.functions.Function1<? super androidx.navigation.NavArgumentBuilder,kotlin.Unit>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDestinationBuilder.argument(String,kotlin.jvm.functions.Function1<? super androidx.navigation.NavArgumentBuilder,kotlin.Unit>)
+BuilderSetStyle: androidx.navigation.NavDestinationBuilder#deepLink(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDestinationBuilder.deepLink(String)
+BuilderSetStyle: androidx.navigation.NavDestinationBuilder#deepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDestinationBuilder.deepLink(kotlin.jvm.functions.Function1<? super androidx.navigation.NavDeepLinkDslBuilder,kotlin.Unit>)
+BuilderSetStyle: androidx.navigation.NavOptionsBuilder#anim(kotlin.jvm.functions.Function1<? super androidx.navigation.AnimBuilder,kotlin.Unit>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavOptionsBuilder.anim(kotlin.jvm.functions.Function1<? super androidx.navigation.AnimBuilder,kotlin.Unit>)
+BuilderSetStyle: androidx.navigation.NavOptionsBuilder#popUpTo(int, kotlin.jvm.functions.Function1<? super androidx.navigation.PopUpToBuilder,kotlin.Unit>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavOptionsBuilder.popUpTo(int,kotlin.jvm.functions.Function1<? super androidx.navigation.PopUpToBuilder,kotlin.Unit>)
+
+
 DocumentExceptions: androidx.navigation.NavArgumentBuilder#getType():
     Method NavArgumentBuilder.getType appears to be throwing java.lang.IllegalStateException; this should be listed in the documentation; see https://android.github.io/kotlin-guides/interop.html#document-exceptions
 DocumentExceptions: androidx.navigation.NavGraphBuilder#build():
diff --git a/navigation/navigation-common/api/api_lint.ignore b/navigation/navigation-common/api/api_lint.ignore
index 9c1799e7..50d8eb6 100644
--- a/navigation/navigation-common/api/api_lint.ignore
+++ b/navigation/navigation-common/api/api_lint.ignore
@@ -13,5 +13,19 @@
     Method parameter should be Collection<D> (or subclass) instead of raw array; was `D[]`
 
 
+BuilderSetStyle: androidx.navigation.NavDeepLink.Builder#fromAction(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLink.Builder.fromAction(String)
+BuilderSetStyle: androidx.navigation.NavDeepLink.Builder#fromMimeType(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLink.Builder.fromMimeType(String)
+BuilderSetStyle: androidx.navigation.NavDeepLink.Builder#fromUriPattern(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLink.Builder.fromUriPattern(String)
+BuilderSetStyle: androidx.navigation.NavDeepLinkRequest.Builder#fromAction(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLinkRequest.Builder.fromAction(String)
+BuilderSetStyle: androidx.navigation.NavDeepLinkRequest.Builder#fromMimeType(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLinkRequest.Builder.fromMimeType(String)
+BuilderSetStyle: androidx.navigation.NavDeepLinkRequest.Builder#fromUri(android.net.Uri):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLinkRequest.Builder.fromUri(android.net.Uri)
+
+
 KotlinOperator: androidx.navigation.NavType#get(android.os.Bundle, String):
     Method can be invoked with an indexing operator from Kotlin: `get` (this is usually desirable; just make sure it makes sense for this type of object)
diff --git a/navigation/navigation-runtime/api/api_lint.ignore b/navigation/navigation-runtime/api/api_lint.ignore
index 12f82c6..8005e78 100644
--- a/navigation/navigation-runtime/api/api_lint.ignore
+++ b/navigation/navigation-runtime/api/api_lint.ignore
@@ -1,4 +1,10 @@
 // Baseline format: 1.0
+BuilderSetStyle: androidx.navigation.NavDeepLinkBuilder#createPendingIntent():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLinkBuilder.createPendingIntent()
+BuilderSetStyle: androidx.navigation.NavDeepLinkBuilder#createTaskStackBuilder():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.navigation.NavDeepLinkBuilder.createTaskStackBuilder()
+
+
 MissingBuildMethod: androidx.navigation.NavDeepLinkBuilder:
     androidx.navigation.NavDeepLinkBuilder does not declare a `build()` method, but builder classes are expected to
 
diff --git a/paging/rxjava2/api/api_lint.ignore b/paging/rxjava2/api/api_lint.ignore
index 20c6bba..153d977 100644
--- a/paging/rxjava2/api/api_lint.ignore
+++ b/paging/rxjava2/api/api_lint.ignore
@@ -1,4 +1,10 @@
 // Baseline format: 1.0
+BuilderSetStyle: androidx.paging.RxPagedListBuilder#buildFlowable(io.reactivex.BackpressureStrategy):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.paging.RxPagedListBuilder.buildFlowable(io.reactivex.BackpressureStrategy)
+BuilderSetStyle: androidx.paging.RxPagedListBuilder#buildObservable():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.paging.RxPagedListBuilder.buildObservable()
+
+
 MissingBuildMethod: androidx.paging.RxPagedListBuilder:
     androidx.paging.RxPagedListBuilder does not declare a `build()` method, but builder classes are expected to
 
diff --git a/palette/palette/api/api_lint.ignore b/palette/palette/api/api_lint.ignore
index b8c8876..162d7eb 100644
--- a/palette/palette/api/api_lint.ignore
+++ b/palette/palette/api/api_lint.ignore
@@ -1,3 +1,13 @@
 // Baseline format: 1.0
+BuilderSetStyle: androidx.palette.graphics.Palette.Builder#generate():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.palette.graphics.Palette.Builder.generate()
+BuilderSetStyle: androidx.palette.graphics.Palette.Builder#generate(androidx.palette.graphics.Palette.PaletteAsyncListener):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.palette.graphics.Palette.Builder.generate(androidx.palette.graphics.Palette.PaletteAsyncListener)
+BuilderSetStyle: androidx.palette.graphics.Palette.Builder#maximumColorCount(int):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.palette.graphics.Palette.Builder.maximumColorCount(int)
+BuilderSetStyle: androidx.palette.graphics.Palette.Builder#resizeBitmapArea(int):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.palette.graphics.Palette.Builder.resizeBitmapArea(int)
+
+
 MissingBuildMethod: androidx.palette.graphics.Palette.Builder:
     androidx.palette.graphics.Palette.Builder does not declare a `build()` method, but builder classes are expected to
diff --git a/preference/preference/api/api_lint.ignore b/preference/preference/api/api_lint.ignore
index de479d5..8cd2bf7 100644
--- a/preference/preference/api/api_lint.ignore
+++ b/preference/preference/api/api_lint.ignore
@@ -19,12 +19,6 @@
     Method parameter should be Collection<CharSequence> (or subclass) instead of raw array; was `java.lang.CharSequence[]`
 
 
-CallbackMethodName: androidx.preference.PreferenceManager.PreferenceComparisonCallback:
-    Callback method names must follow the on<Something> style: arePreferenceItemsTheSame
-CallbackMethodName: androidx.preference.PreferenceManager.SimplePreferenceComparisonCallback:
-    Callback method names must follow the on<Something> style: arePreferenceItemsTheSame
-
-
 InternalField: androidx.preference.TwoStatePreference#mChecked:
     Internal field mChecked must not be exposed
 
diff --git a/recyclerview/recyclerview-selection/api/api_lint.ignore b/recyclerview/recyclerview-selection/api/api_lint.ignore
index a607d9e..82e97e9 100644
--- a/recyclerview/recyclerview-selection/api/api_lint.ignore
+++ b/recyclerview/recyclerview-selection/api/api_lint.ignore
@@ -6,21 +6,21 @@
 
 
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withBandOverlay(int):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withBandOverlay(int)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withBandOverlay(int)
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withBandPredicate(androidx.recyclerview.selection.BandPredicate):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withBandPredicate(androidx.recyclerview.selection.BandPredicate)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withBandPredicate(androidx.recyclerview.selection.BandPredicate)
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withFocusDelegate(androidx.recyclerview.selection.FocusDelegate<K>):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withFocusDelegate(androidx.recyclerview.selection.FocusDelegate<K>)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withFocusDelegate(androidx.recyclerview.selection.FocusDelegate<K>)
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withOnContextClickListener(androidx.recyclerview.selection.OnContextClickListener):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOnContextClickListener(androidx.recyclerview.selection.OnContextClickListener)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOnContextClickListener(androidx.recyclerview.selection.OnContextClickListener)
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withOnDragInitiatedListener(androidx.recyclerview.selection.OnDragInitiatedListener):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOnDragInitiatedListener(androidx.recyclerview.selection.OnDragInitiatedListener)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOnDragInitiatedListener(androidx.recyclerview.selection.OnDragInitiatedListener)
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withOnItemActivatedListener(androidx.recyclerview.selection.OnItemActivatedListener<K>):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOnItemActivatedListener(androidx.recyclerview.selection.OnItemActivatedListener<K>)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOnItemActivatedListener(androidx.recyclerview.selection.OnItemActivatedListener<K>)
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withOperationMonitor(androidx.recyclerview.selection.OperationMonitor):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOperationMonitor(androidx.recyclerview.selection.OperationMonitor)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withOperationMonitor(androidx.recyclerview.selection.OperationMonitor)
 BuilderSetStyle: androidx.recyclerview.selection.SelectionTracker.Builder#withSelectionPredicate(androidx.recyclerview.selection.SelectionTracker.SelectionPredicate<K>):
-    Builder methods names should use setFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withSelectionPredicate(androidx.recyclerview.selection.SelectionTracker.SelectionPredicate<K>)
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.recyclerview.selection.SelectionTracker.Builder.withSelectionPredicate(androidx.recyclerview.selection.SelectionTracker.SelectionPredicate<K>)
 
 
 CallbackName: androidx.recyclerview.selection.SelectionTracker.SelectionObserver:
diff --git a/recyclerview/recyclerview/api/api_lint.ignore b/recyclerview/recyclerview/api/api_lint.ignore
index 2510713..bd0ba08 100644
--- a/recyclerview/recyclerview/api/api_lint.ignore
+++ b/recyclerview/recyclerview/api/api_lint.ignore
@@ -23,26 +23,6 @@
     Methods must not mention RuntimeException subclasses in throws clauses (was `java.lang.IndexOutOfBoundsException`)
 
 
-CallbackMethodName: androidx.recyclerview.widget.AsyncListUtil.DataCallback:
-    Callback method names must follow the on<Something> style: refreshData
-CallbackMethodName: androidx.recyclerview.widget.AsyncListUtil.ViewCallback:
-    Callback method names must follow the on<Something> style: getItemRangeInto
-CallbackMethodName: androidx.recyclerview.widget.BatchingListUpdateCallback:
-    Callback method names must follow the on<Something> style: dispatchLastEvent
-CallbackMethodName: androidx.recyclerview.widget.DiffUtil.Callback:
-    Callback method names must follow the on<Something> style: getOldListSize
-CallbackMethodName: androidx.recyclerview.widget.DiffUtil.ItemCallback:
-    Callback method names must follow the on<Something> style: areItemsTheSame
-CallbackMethodName: androidx.recyclerview.widget.ItemTouchHelper.Callback:
-    Callback method names must follow the on<Something> style: getDefaultUIUtil
-CallbackMethodName: androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback:
-    Callback method names must follow the on<Something> style: setDefaultSwipeDirs
-CallbackMethodName: androidx.recyclerview.widget.SortedList.BatchedCallback:
-    Callback method names must follow the on<Something> style: compare
-CallbackMethodName: androidx.recyclerview.widget.SortedList.Callback:
-    Callback method names must follow the on<Something> style: compare
-
-
 CallbackName: androidx.recyclerview.widget.RecyclerView.AdapterDataObserver:
     Class should be named AdapterDataCallback
 
diff --git a/remotecallback/remotecallback/api/api_lint.ignore b/remotecallback/remotecallback/api/api_lint.ignore
index 732332e..277ff92 100644
--- a/remotecallback/remotecallback/api/api_lint.ignore
+++ b/remotecallback/remotecallback/api/api_lint.ignore
@@ -1,8 +1,4 @@
 // Baseline format: 1.0
-CallbackMethodName: androidx.remotecallback.RemoteCallback:
-    Callback method names must follow the on<Something> style: getType
-
-
 ContextFirst: androidx.remotecallback.RemoteCallback#create(Class<T>, android.content.Context) parameter #1:
     Context is distinct, so it must be the first argument (method `create`)
 
diff --git a/room/runtime/api/api_lint.ignore b/room/runtime/api/api_lint.ignore
index 49e0dbf..8c2f59a 100644
--- a/room/runtime/api/api_lint.ignore
+++ b/room/runtime/api/api_lint.ignore
@@ -3,6 +3,24 @@
     Method parameter should be Collection<Object> (or subclass) instead of raw array; was `java.lang.Object[]`
 
 
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#allowMainThreadQueries():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.allowMainThreadQueries()
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#createFromAsset(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.createFromAsset(String)
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#createFromFile(java.io.File):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.createFromFile(java.io.File)
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#enableMultiInstanceInvalidation():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.enableMultiInstanceInvalidation()
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#fallbackToDestructiveMigration():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.fallbackToDestructiveMigration()
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#fallbackToDestructiveMigrationFrom(int...):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.fallbackToDestructiveMigrationFrom(int...)
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#fallbackToDestructiveMigrationOnDowngrade():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.fallbackToDestructiveMigrationOnDowngrade()
+BuilderSetStyle: androidx.room.RoomDatabase.Builder#openHelperFactory(androidx.sqlite.db.SupportSQLiteOpenHelper.Factory):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.room.RoomDatabase.Builder.openHelperFactory(androidx.sqlite.db.SupportSQLiteOpenHelper.Factory)
+
+
 CallbackName: androidx.room.InvalidationTracker.Observer:
     Class should be named Callback
 
diff --git a/sqlite/sqlite/api/api_lint.ignore b/sqlite/sqlite/api/api_lint.ignore
index fa0a8dd..a9d0891 100644
--- a/sqlite/sqlite/api/api_lint.ignore
+++ b/sqlite/sqlite/api/api_lint.ignore
@@ -35,6 +35,32 @@
     Method parameter should be Collection<Object> (or subclass) instead of raw array; was `java.lang.Object[]`
 
 
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder#callback(androidx.sqlite.db.SupportSQLiteOpenHelper.Callback):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder.callback(androidx.sqlite.db.SupportSQLiteOpenHelper.Callback)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder#name(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder.name(String)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder#noBackupDirectory(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteOpenHelper.Configuration.Builder.noBackupDirectory(boolean)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#builder(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.builder(String)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#columns(String[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.columns(String[])
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#create():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.create()
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#distinct():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.distinct()
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#groupBy(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.groupBy(String)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#having(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.having(String)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#limit(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.limit(String)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#orderBy(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.orderBy(String)
+BuilderSetStyle: androidx.sqlite.db.SupportSQLiteQueryBuilder#selection(String, Object[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.sqlite.db.SupportSQLiteQueryBuilder.selection(String,Object[])
+
+
 MissingBuildMethod: androidx.sqlite.db.SupportSQLiteQueryBuilder:
     androidx.sqlite.db.SupportSQLiteQueryBuilder does not declare a `build()` method, but builder classes are expected to
 
diff --git a/textclassifier/textclassifier/api/api_lint.ignore b/textclassifier/textclassifier/api/api_lint.ignore
index fe3256c..b4fcb1d 100644
--- a/textclassifier/textclassifier/api/api_lint.ignore
+++ b/textclassifier/textclassifier/api/api_lint.ignore
@@ -15,6 +15,10 @@
     Must avoid boxed primitives (`java.lang.Long`)
 
 
+BuilderSetStyle: androidx.textclassifier.TextClassifier.EntityConfig.Builder#includeTypesFromTextClassifier(boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.textclassifier.TextClassifier.EntityConfig.Builder.includeTypesFromTextClassifier(boolean)
+
+
 MissingNullability: androidx.textclassifier.TextClassification#getConfidenceScore(String) parameter #0:
     Missing nullability on parameter `entity` in method `getConfidenceScore`
 MissingNullability: androidx.textclassifier.TextClassification.Builder#setEntityType(String, float):
diff --git a/tv-provider/tv-provider/api/api_lint.ignore b/tv-provider/tv-provider/api/api_lint.ignore
index c2050f2..7c43e2f 100644
--- a/tv-provider/tv-provider/api/api_lint.ignore
+++ b/tv-provider/tv-provider/api/api_lint.ignore
@@ -273,10 +273,6 @@
     Missing nullability on method `setAppLinkIntentUri` return
 MissingNullability: androidx.tvprovider.media.tv.PreviewChannel.Builder#setAppLinkIntentUri(android.net.Uri) parameter #0:
     Missing nullability on parameter `appLinkIntentUri` in method `setAppLinkIntentUri`
-MissingNullability: androidx.tvprovider.media.tv.PreviewChannel.Builder#setDescription(CharSequence):
-    Missing nullability on method `setDescription` return
-MissingNullability: androidx.tvprovider.media.tv.PreviewChannel.Builder#setDescription(CharSequence) parameter #0:
-    Missing nullability on parameter `description` in method `setDescription`
 MissingNullability: androidx.tvprovider.media.tv.PreviewChannel.Builder#setDisplayName(CharSequence):
     Missing nullability on method `setDisplayName` return
 MissingNullability: androidx.tvprovider.media.tv.PreviewChannel.Builder#setDisplayName(CharSequence) parameter #0:
diff --git a/ui/ui-core/api/api_lint.ignore b/ui/ui-core/api/api_lint.ignore
index f6b8aeb..5bf293e 100644
--- a/ui/ui-core/api/api_lint.ignore
+++ b/ui/ui-core/api/api_lint.ignore
@@ -1,6 +1,8 @@
 // Baseline format: 1.0
 AcronymName: androidx.ui.core.AlignmentLineKt#merge-CBRbNzc(androidx.ui.core.AlignmentLine, int, int):
     Acronyms should not be capitalized in method names: was `merge-CBRbNzc`, should this be `merge-CbRbNzc`?
+AcronymName: androidx.ui.core.ContentScaleKt#scale-iWWM28M(androidx.ui.core.ContentScale, long, long):
+    Acronyms should not be capitalized in method names: was `scale-iWWM28M`, should this be `scale-iWwM28M`?
 AcronymName: androidx.ui.core.DrawShadowKt#drawShadow-xWKVMPI(androidx.ui.core.Modifier, float, androidx.ui.graphics.Shape, boolean, float):
     Acronyms should not be capitalized in method names: was `drawShadow-xWKVMPI`, should this be `drawShadow-xWkvmpi`?
 AcronymName: androidx.ui.core.IntrinsicMeasureScope#maxIntrinsicHeight-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int):
@@ -31,17 +33,33 @@
     Method parameter should be Collection<PointerInputChange> (or subclass) instead of raw array; was `androidx.ui.core.PointerInputChange[]`
 
 
+BuilderSetStyle: androidx.ui.graphics.vector.VectorAssetBuilder#popGroup():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.VectorAssetBuilder.popGroup()
+BuilderSetStyle: androidx.ui.graphics.vector.VectorAssetBuilder#pushGroup(String, float, float, float, float, float, float, float, java.util.List<? extends androidx.ui.graphics.vector.PathNode>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.VectorAssetBuilder.pushGroup(String,float,float,float,float,float,float,float,java.util.List<? extends androidx.ui.graphics.vector.PathNode>)
+
+
+CallbackName: androidx.ui.core.ModelObserver:
+    Class should be named ModelCallback
+CallbackName: androidx.ui.core.gesture.DragObserver:
+    Class should be named DragCallback
+CallbackName: androidx.ui.core.gesture.LongPressDragObserver:
+    Class should be named LongPressDragCallback
+CallbackName: androidx.ui.core.gesture.RawScaleObserver:
+    Class should be named RawScaleCallback
+CallbackName: androidx.ui.core.gesture.ScaleObserver:
+    Class should be named ScaleCallback
+
+
 ContextFirst: androidx.ui.core.WrapperKt#subcomposeInto(androidx.ui.core.ComponentNode, android.content.Context, androidx.compose.CompositionReference, kotlin.jvm.functions.Function0<kotlin.Unit>) parameter #1:
     Context is distinct, so it must be the first argument (method `subcomposeInto`)
 
 
-TopLevelBuilder: androidx.ui.graphics.vector.VectorAssetBuilder:
-    Builder should be defined as inner class: androidx.ui.graphics.vector.VectorAssetBuilder
-
-
-MissingNullability: androidx.ui.core.Constraints2#toString-impl(long):
-    Missing nullability on method `toString-impl` return
 MissingNullability: androidx.ui.core.PointerId#toString-impl(long):
     Missing nullability on method `toString-impl` return
 MissingNullability: androidx.ui.core.TransformOrigin#toString-impl(long):
     Missing nullability on method `toString-impl` return
+
+
+TopLevelBuilder: androidx.ui.graphics.vector.VectorAssetBuilder:
+    Builder should be defined as inner class: androidx.ui.graphics.vector.VectorAssetBuilder
diff --git a/ui/ui-geometry/api/api_lint.ignore b/ui/ui-geometry/api/api_lint.ignore
index db1ca8b..ea11d6f 100644
--- a/ui/ui-geometry/api/api_lint.ignore
+++ b/ui/ui-geometry/api/api_lint.ignore
@@ -1,13 +1,9 @@
 // Baseline format: 1.0
+AcronymName: androidx.ui.geometry.Rect.Companion#fromCircle-hSKLB2U(long, float):
+    Acronyms should not be capitalized in method names: was `fromCircle-hSKLB2U`, should this be `fromCircle-hSklB2U`?
 AcronymName: androidx.ui.geometry.Rect.Companion#fromLTRB(float, float, float, float):
     Acronyms should not be capitalized in method names: was `fromLTRB`, should this be `fromLtrb`?
 AcronymName: androidx.ui.geometry.Rect.Companion#fromLTWH(float, float, float, float):
     Acronyms should not be capitalized in method names: was `fromLTWH`, should this be `fromLtwh`?
-
-
-KotlinOperator: androidx.ui.geometry.RRect#contains(androidx.ui.geometry.Offset):
-    Note that adding the `operator` keyword would allow calling this method using operator syntax
-KotlinOperator: androidx.ui.geometry.Rect#contains(androidx.ui.geometry.Offset):
-    Note that adding the `operator` keyword would allow calling this method using operator syntax
-KotlinOperator: androidx.ui.geometry.Size#contains(androidx.ui.geometry.Offset):
-    Note that adding the `operator` keyword would allow calling this method using operator syntax
+AcronymName: androidx.ui.geometry.Size.Companion#lerp-T-c3OIQ(long, long, float):
+    Acronyms should not be capitalized in method names: was `lerp-T-c3OIQ`, should this be `lerp-T-c3Oiq`?
diff --git a/ui/ui-graphics/api/api_lint.ignore b/ui/ui-graphics/api/api_lint.ignore
index 6bbb26a..8d69f10 100644
--- a/ui/ui-graphics/api/api_lint.ignore
+++ b/ui/ui-graphics/api/api_lint.ignore
@@ -1,4 +1,8 @@
 // Baseline format: 1.0
+AcronymName: androidx.ui.graphics.Canvas#drawCircle-NfwrgZA(long, float, androidx.ui.graphics.Paint):
+    Acronyms should not be capitalized in method names: was `drawCircle-NfwrgZA`, should this be `drawCircle-NfwrgZa`?
+AcronymName: androidx.ui.graphics.Canvas#drawImage--AHD2Ng(androidx.ui.graphics.ImageAsset, long, androidx.ui.graphics.Paint):
+    Acronyms should not be capitalized in method names: was `drawImage--AHD2Ng`, should this be `drawImage--AhD2Ng`?
 AcronymName: androidx.ui.graphics.ColorFilter.Companion#tint-QEYXlZo(long):
     Acronyms should not be capitalized in method names: was `tint-QEYXlZo`, should this be `tint-QeyXlZo`?
 AcronymName: androidx.ui.graphics.ColorKt#isSet-QEYXlZo(long):
@@ -15,8 +19,18 @@
     Acronyms should not be capitalized in method names: was `setColor-QEYXlZo`, should this be `setColor-QeyXlZo`?
 AcronymName: androidx.ui.graphics.SolidColor#copy-QEYXlZo(long):
     Acronyms should not be capitalized in method names: was `copy-QEYXlZo`, should this be `copy-QeyXlZo`?
+AcronymName: androidx.ui.graphics.painter.CanvasScope#drawCircle-uHGJFV8(androidx.ui.graphics.Brush, float, long, float, androidx.ui.graphics.painter.DrawStyle, androidx.ui.graphics.ColorFilter, androidx.ui.graphics.BlendMode):
+    Acronyms should not be capitalized in method names: was `drawCircle-uHGJFV8`, should this be `drawCircle-uHgjfV8`?
+AcronymName: androidx.ui.graphics.painter.CanvasScope#drawLine-PWBr8KI(androidx.ui.graphics.Brush, long, long, androidx.ui.graphics.painter.Stroke, float, androidx.ui.graphics.ColorFilter, androidx.ui.graphics.BlendMode):
+    Acronyms should not be capitalized in method names: was `drawLine-PWBr8KI`, should this be `drawLine-PwBr8Ki`?
+AcronymName: androidx.ui.graphics.painter.CanvasScope#drawOval-EPCrxCw(long, long, long, float, androidx.ui.graphics.painter.DrawStyle, androidx.ui.graphics.ColorFilter, androidx.ui.graphics.BlendMode):
+    Acronyms should not be capitalized in method names: was `drawOval-EPCrxCw`, should this be `drawOval-EpCrxCw`?
+AcronymName: androidx.ui.graphics.painter.CanvasScope#drawRect-EPCrxCw(long, long, long, float, androidx.ui.graphics.painter.DrawStyle, androidx.ui.graphics.ColorFilter, androidx.ui.graphics.BlendMode):
+    Acronyms should not be capitalized in method names: was `drawRect-EPCrxCw`, should this be `drawRect-EpCrxCw`?
 AcronymName: androidx.ui.graphics.painter.ColorPainter#copy-QEYXlZo(long):
     Acronyms should not be capitalized in method names: was `copy-QEYXlZo`, should this be `copy-QeyXlZo`?
+AcronymName: androidx.ui.graphics.painter.ImagePainter#copy-gqgapXI(androidx.ui.graphics.ImageAsset, long, long):
+    Acronyms should not be capitalized in method names: was `copy-gqgapXI`, should this be `copy-gqgapXi`?
 
 
 ArrayReturn: androidx.ui.graphics.BrushKt#HorizontalGradient-G0qqrXo(kotlin.Pair<java.lang.Float,androidx.ui.graphics.Color>[], float, float, androidx.ui.graphics.TileMode) parameter #0:
@@ -37,6 +51,46 @@
     Must avoid boxed primitives (`java.lang.Float`)
 
 
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#arcTo(float, float, float, boolean, boolean, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.arcTo(float,float,float,boolean,boolean,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#arcToRelative(float, float, float, boolean, boolean, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.arcToRelative(float,float,float,boolean,boolean,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#close():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.close()
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#curveTo(float, float, float, float, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.curveTo(float,float,float,float,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#curveToRelative(float, float, float, float, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.curveToRelative(float,float,float,float,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#horizontalLineTo(float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.horizontalLineTo(float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#horizontalLineToRelative(float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.horizontalLineToRelative(float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#lineTo(float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.lineTo(float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#lineToRelative(float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.lineToRelative(float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#moveTo(float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.moveTo(float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#moveToRelative(float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.moveToRelative(float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#quadTo(float, float, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.quadTo(float,float,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#quadToRelative(float, float, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.quadToRelative(float,float,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#reflectiveCurveTo(float, float, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.reflectiveCurveTo(float,float,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#reflectiveCurveToRelative(float, float, float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.reflectiveCurveToRelative(float,float,float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#reflectiveQuadTo(float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.reflectiveQuadTo(float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#reflectiveQuadToRelative(float, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.reflectiveQuadToRelative(float,float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#verticalLineTo(float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.verticalLineTo(float)
+BuilderSetStyle: androidx.ui.graphics.vector.PathBuilder#verticalLineToRelative(float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.graphics.vector.PathBuilder.verticalLineToRelative(float)
+
+
 DocumentExceptions: androidx.ui.graphics.vectormath.Matrix3#get(androidx.ui.graphics.vectormath.MatrixColumn):
     Method Matrix3.get appears to be throwing java.lang.IllegalArgumentException; this should be listed in the documentation; see https://android.github.io/kotlin-guides/interop.html#document-exceptions
 DocumentExceptions: androidx.ui.graphics.vectormath.Matrix3#get(int):
diff --git a/ui/ui-layout/api/api_lint.ignore b/ui/ui-layout/api/api_lint.ignore
index cffda90..a86577a 100644
--- a/ui/ui-layout/api/api_lint.ignore
+++ b/ui/ui-layout/api/api_lint.ignore
@@ -25,6 +25,8 @@
     Acronyms should not be capitalized in method names: was `offset-qJOR85M`, should this be `offset-qJoR85M`?
 AcronymName: androidx.ui.layout.LayoutPaddingKt#padding-qJOR85M(androidx.ui.core.Modifier, float, float):
     Acronyms should not be capitalized in method names: was `padding-qJOR85M`, should this be `padding-qJoR85M`?
+AcronymName: androidx.ui.layout.LayoutSizeKt#defaultMinSizeConstraints-qJOR85M(androidx.ui.core.Modifier, float, float):
+    Acronyms should not be capitalized in method names: was `defaultMinSizeConstraints-qJOR85M`, should this be `defaultMinSizeConstraints-qJoR85M`?
 AcronymName: androidx.ui.layout.LayoutSizeKt#heightIn-qJOR85M(androidx.ui.core.Modifier, float, float):
     Acronyms should not be capitalized in method names: was `heightIn-qJOR85M`, should this be `heightIn-qJoR85M`?
 AcronymName: androidx.ui.layout.LayoutSizeKt#preferredHeightIn-qJOR85M(androidx.ui.core.Modifier, float, float):
diff --git a/ui/ui-test/api/api_lint.ignore b/ui/ui-test/api/api_lint.ignore
index f23a46e..3138bb5 100644
--- a/ui/ui-test/api/api_lint.ignore
+++ b/ui/ui-test/api/api_lint.ignore
@@ -1,6 +1,8 @@
 // Baseline format: 1.0
 AcronymName: androidx.ui.test.BitmapHelpersKt#assertPixelColor-9bBi3KA(android.graphics.Bitmap, long, int, int, kotlin.jvm.functions.Function1<? super androidx.ui.graphics.Color,java.lang.String>):
     Acronyms should not be capitalized in method names: was `assertPixelColor-9bBi3KA`, should this be `assertPixelColor-9bBi3Ka`?
+AcronymName: androidx.ui.test.BitmapHelpersKt#assertShape-2l1GYV8(android.graphics.Bitmap, androidx.ui.unit.Density, float, float, long, long, androidx.ui.graphics.Shape, float):
+    Acronyms should not be capitalized in method names: was `assertShape-2l1GYV8`, should this be `assertShape-2l1GyV8`?
 AcronymName: androidx.ui.test.BitmapHelpersKt#assertShape-nbwoFSQ(android.graphics.Bitmap, androidx.ui.unit.Density, androidx.ui.graphics.Shape, long, long, androidx.ui.graphics.Shape, float, float, float, float, float, float, float):
     Acronyms should not be capitalized in method names: was `assertShape-nbwoFSQ`, should this be `assertShape-nbwoFsq`?
 
diff --git a/ui/ui-text-core/api/api_lint.ignore b/ui/ui-text-core/api/api_lint.ignore
index f6d6d03..0b3a507 100644
--- a/ui/ui-text-core/api/api_lint.ignore
+++ b/ui/ui-text-core/api/api_lint.ignore
@@ -3,6 +3,28 @@
     Acronyms should not be capitalized in method names: was `copy-4Bo2vQE`, should this be `copy-4Bo2vQe`?
 
 
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#append(String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.append(String)
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#append(androidx.ui.text.AnnotatedString):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.append(androidx.ui.text.AnnotatedString)
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#append(char):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.append(char)
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pop():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pop()
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pop(int):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pop(int)
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pushStringAnnotation(String, String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pushStringAnnotation(String,String)
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pushStyle(androidx.ui.text.ParagraphStyle):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pushStyle(androidx.ui.text.ParagraphStyle)
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pushStyle(androidx.ui.text.SpanStyle):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pushStyle(androidx.ui.text.SpanStyle)
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#toAnnotatedString():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.toAnnotatedString()
+BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#toString():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.toString()
+
+
 KotlinOperator: androidx.ui.text.font.FontListFontFamily#contains(androidx.ui.text.font.Font):
     Note that adding the `operator` keyword would allow calling this method using operator syntax
 KotlinOperator: androidx.ui.text.style.TextDecoration#contains(androidx.ui.text.style.TextDecoration):
@@ -15,3 +37,11 @@
 
 MissingNullability: androidx.ui.text.style.BaselineShift#toString-impl(float):
     Missing nullability on method `toString-impl` return
+
+
+SetterReturnsThis: androidx.ui.text.AnnotatedString.Builder#addAnnotationString(String, String, int, int):
+    Methods must return the builder object (return type androidx.ui.text.AnnotatedString.Builder instead of void): method androidx.ui.text.AnnotatedString.Builder.addAnnotationString(String,String,int,int)
+SetterReturnsThis: androidx.ui.text.AnnotatedString.Builder#addStyle(androidx.ui.text.ParagraphStyle, int, int):
+    Methods must return the builder object (return type androidx.ui.text.AnnotatedString.Builder instead of void): method androidx.ui.text.AnnotatedString.Builder.addStyle(androidx.ui.text.ParagraphStyle,int,int)
+SetterReturnsThis: androidx.ui.text.AnnotatedString.Builder#addStyle(androidx.ui.text.SpanStyle, int, int):
+    Methods must return the builder object (return type androidx.ui.text.AnnotatedString.Builder instead of void): method androidx.ui.text.AnnotatedString.Builder.addStyle(androidx.ui.text.SpanStyle,int,int)
diff --git a/ui/ui-tooling/api/api_lint.ignore b/ui/ui-tooling/api/api_lint.ignore
deleted file mode 100644
index 9f69676..0000000
--- a/ui/ui-tooling/api/api_lint.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-MissingNullability: androidx.ui.tooling.InspectableKt#getTables():
-    Missing nullability on method `getTables` return
diff --git a/wear/wear/api/api_lint.ignore b/wear/wear/api/api_lint.ignore
index 194e0f2..1cbce750 100644
--- a/wear/wear/api/api_lint.ignore
+++ b/wear/wear/api/api_lint.ignore
@@ -13,10 +13,6 @@
     Inconsistent extra value; expected `androidx.wear.ambient.extra.LOWBIT_AMBIENT`, was `com.google.android.wearable.compat.extra.LOWBIT_AMBIENT`
 
 
-CallbackMethodName: androidx.wear.widget.CurvingLayoutCallback:
-    Callback method names must follow the on<Something> style: adjustAnchorOffsetXY
-
-
 ForbiddenSuperClass: androidx.wear.activity.ConfirmationActivity:
     ConfirmationActivity should not extend `Activity`. Activity subclasses are impossible to compose. Expose a composable API instead.
 
diff --git a/webkit/webkit/api/api_lint.ignore b/webkit/webkit/api/api_lint.ignore
index 2eb478a..0ec5493 100644
--- a/webkit/webkit/api/api_lint.ignore
+++ b/webkit/webkit/api/api_lint.ignore
@@ -7,6 +7,12 @@
     Method should return Collection<WebMessagePortCompat> (or subclass) instead of raw array; was `androidx.webkit.WebMessagePortCompat[]`
 
 
+BuilderSetStyle: androidx.webkit.ProxyConfig.Builder#bypassSimpleHostnames():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.webkit.ProxyConfig.Builder.bypassSimpleHostnames()
+BuilderSetStyle: androidx.webkit.ProxyConfig.Builder#removeImplicitRules():
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.webkit.ProxyConfig.Builder.removeImplicitRules()
+
+
 IntentName: androidx.webkit.WebViewFeature#DISABLED_ACTION_MODE_MENU_ITEMS:
     Intent action constant name must be ACTION_FOO: DISABLED_ACTION_MODE_MENU_ITEMS
 
diff --git a/work/workmanager-testing/api/api_lint.ignore b/work/workmanager-testing/api/api_lint.ignore
index 583b20b..a23d747 100644
--- a/work/workmanager-testing/api/api_lint.ignore
+++ b/work/workmanager-testing/api/api_lint.ignore
@@ -1,4 +1,10 @@
 // Baseline format: 1.0
+BuilderSetStyle: androidx.work.testing.TestListenableWorkerBuilder#from(android.content.Context, Class<W>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.testing.TestListenableWorkerBuilder.from(android.content.Context,Class<W>)
+BuilderSetStyle: androidx.work.testing.TestListenableWorkerBuilder#from(android.content.Context, androidx.work.WorkRequest):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.testing.TestListenableWorkerBuilder.from(android.content.Context,androidx.work.WorkRequest)
+
+
 MissingNullability: androidx.work.testing.TestListenableWorkerBuilderKt#TestListenableWorkerBuilder(android.content.Context, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
     Missing nullability on method `TestListenableWorkerBuilder` return
 MissingNullability: androidx.work.testing.TestWorkerBuilderKt#TestWorkerBuilder(android.content.Context, java.util.concurrent.Executor, androidx.work.Data, java.util.List<? extends java.lang.String>, int, java.util.List<? extends android.net.Uri>, java.util.List<? extends java.lang.String>):
diff --git a/work/workmanager/api/api_lint.ignore b/work/workmanager/api/api_lint.ignore
index 6185dcc..444e9d1 100644
--- a/work/workmanager/api/api_lint.ignore
+++ b/work/workmanager/api/api_lint.ignore
@@ -7,6 +7,44 @@
     Acronyms should not be capitalized in class names: was `SUCCESS`, should this be `Success`?
 
 
+BuilderSetStyle: androidx.work.Data.Builder#putAll(androidx.work.Data):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putAll(androidx.work.Data)
+BuilderSetStyle: androidx.work.Data.Builder#putAll(java.util.Map<java.lang.String,java.lang.Object>):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putAll(java.util.Map<java.lang.String,java.lang.Object>)
+BuilderSetStyle: androidx.work.Data.Builder#putBoolean(String, boolean):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putBoolean(String,boolean)
+BuilderSetStyle: androidx.work.Data.Builder#putBooleanArray(String, boolean[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putBooleanArray(String,boolean[])
+BuilderSetStyle: androidx.work.Data.Builder#putByte(String, byte):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putByte(String,byte)
+BuilderSetStyle: androidx.work.Data.Builder#putByteArray(String, byte[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putByteArray(String,byte[])
+BuilderSetStyle: androidx.work.Data.Builder#putDouble(String, double):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putDouble(String,double)
+BuilderSetStyle: androidx.work.Data.Builder#putDoubleArray(String, double[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putDoubleArray(String,double[])
+BuilderSetStyle: androidx.work.Data.Builder#putFloat(String, float):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putFloat(String,float)
+BuilderSetStyle: androidx.work.Data.Builder#putFloatArray(String, float[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putFloatArray(String,float[])
+BuilderSetStyle: androidx.work.Data.Builder#putInt(String, int):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putInt(String,int)
+BuilderSetStyle: androidx.work.Data.Builder#putIntArray(String, int[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putIntArray(String,int[])
+BuilderSetStyle: androidx.work.Data.Builder#putLong(String, long):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putLong(String,long)
+BuilderSetStyle: androidx.work.Data.Builder#putLongArray(String, long[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putLongArray(String,long[])
+BuilderSetStyle: androidx.work.Data.Builder#putString(String, String):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putString(String,String)
+BuilderSetStyle: androidx.work.Data.Builder#putStringArray(String, String[]):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.Data.Builder.putStringArray(String,String[])
+BuilderSetStyle: androidx.work.WorkRequest.Builder#keepResultsForAtLeast(java.time.Duration):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.WorkRequest.Builder.keepResultsForAtLeast(java.time.Duration)
+BuilderSetStyle: androidx.work.WorkRequest.Builder#keepResultsForAtLeast(long, java.util.concurrent.TimeUnit):
+    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.WorkRequest.Builder.keepResultsForAtLeast(long,java.util.concurrent.TimeUnit)
+
+
 MissingNullability: androidx.work.Constraints#NONE:
     Missing nullability on field `NONE` in class `class androidx.work.Constraints`
 MissingNullability: androidx.work.Constraints.Builder#setTriggerContentMaxDelay(java.time.Duration) parameter #0:
@@ -25,6 +63,8 @@
     Should avoid odd sized primitives; use `int` instead of `byte` in parameter value in androidx.work.Data.Builder.putByte(String key, byte value)
 
 
+SetterReturnsThis: androidx.work.WorkRequest.Builder#addTag(String):
+    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.addTag(String)
 SetterReturnsThis: androidx.work.WorkRequest.Builder#setBackoffCriteria(androidx.work.BackoffPolicy, java.time.Duration):
     Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.setBackoffCriteria(androidx.work.BackoffPolicy,java.time.Duration)
 SetterReturnsThis: androidx.work.WorkRequest.Builder#setBackoffCriteria(androidx.work.BackoffPolicy, long, java.util.concurrent.TimeUnit):