diff --git a/catalog/java/io/material/catalog/tabs/TabsAutoDemoFragment.java b/catalog/java/io/material/catalog/tabs/TabsAutoDemoFragment.java
index 4ffceafd1..f4740628a 100644
--- a/catalog/java/io/material/catalog/tabs/TabsAutoDemoFragment.java
+++ b/catalog/java/io/material/catalog/tabs/TabsAutoDemoFragment.java
@@ -21,12 +21,12 @@ import io.material.catalog.R;
 import android.os.Bundle;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayout.Tab;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayout.Tab;
 import io.material.catalog.feature.DemoFragment;
 
 /** A fragment that displays a scrollable tabs demo for the Catalog app. */
diff --git a/catalog/java/io/material/catalog/tabs/TabsControllableDemoFragment.java b/catalog/java/io/material/catalog/tabs/TabsControllableDemoFragment.java
index 074310bc3..fbeb52752 100644
--- a/catalog/java/io/material/catalog/tabs/TabsControllableDemoFragment.java
+++ b/catalog/java/io/material/catalog/tabs/TabsControllableDemoFragment.java
@@ -25,10 +25,6 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayout.LabelVisibility;
-import com.google.android.material.tabs.TabLayout.OnTabSelectedListener;
-import com.google.android.material.tabs.TabLayout.Tab;
 import androidx.appcompat.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,6 +36,10 @@ import android.widget.RadioButton;
 import android.widget.Spinner;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.badge.BadgeDrawable;
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayout.LabelVisibility;
+import com.google.android.material.tabs.TabLayout.OnTabSelectedListener;
+import com.google.android.material.tabs.TabLayout.Tab;
 import io.material.catalog.feature.DemoFragment;
 import io.material.catalog.feature.DemoUtils;
 import java.util.List;
diff --git a/catalog/java/io/material/catalog/tabs/TabsMainDemoFragment.java b/catalog/java/io/material/catalog/tabs/TabsMainDemoFragment.java
index 03f339c0c..66a3e5a12 100644
--- a/catalog/java/io/material/catalog/tabs/TabsMainDemoFragment.java
+++ b/catalog/java/io/material/catalog/tabs/TabsMainDemoFragment.java
@@ -22,13 +22,13 @@ import android.os.Bundle;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayout.OnTabSelectedListener;
-import com.google.android.material.tabs.TabLayout.Tab;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import com.google.android.material.badge.BadgeDrawable;
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayout.OnTabSelectedListener;
+import com.google.android.material.tabs.TabLayout.Tab;
 import io.material.catalog.feature.DemoFragment;
 import io.material.catalog.feature.DemoUtils;
 import java.util.List;
diff --git a/tests/javatests/com/google/android/material/appbar/AppBarWithToolbarAndTabsTest.java b/tests/javatests/com/google/android/material/appbar/AppBarWithToolbarAndTabsTest.java
index f0844342b..aca6dd7f8 100644
--- a/tests/javatests/com/google/android/material/appbar/AppBarWithToolbarAndTabsTest.java
+++ b/tests/javatests/com/google/android/material/appbar/AppBarWithToolbarAndTabsTest.java
@@ -24,12 +24,12 @@ import static org.junit.Assert.assertEquals;
 import android.os.SystemClock;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.StringRes;
-import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.testapp.R;
 import com.google.android.material.testutils.Cheeses;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
+import com.google.android.material.tabs.TabLayout;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/tests/javatests/com/google/android/material/tabs/TabLayoutTest.java b/tests/javatests/com/google/android/material/tabs/TabLayoutTest.java
index a512664f4..45052376e 100644
--- a/tests/javatests/com/google/android/material/tabs/TabLayoutTest.java
+++ b/tests/javatests/com/google/android/material/tabs/TabLayoutTest.java
@@ -37,7 +37,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
 import android.os.Build;
-import com.google.android.material.tabs.TabLayout.Tab;
 import com.google.android.material.testapp.R;
 import androidx.core.view.ViewCompat;
 import androidx.appcompat.app.AppCompatActivity;
@@ -54,6 +53,7 @@ import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
+import com.google.android.material.tabs.TabLayout.Tab;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/tests/javatests/com/google/android/material/testutils/TabLayoutActions.java b/tests/javatests/com/google/android/material/testutils/TabLayoutActions.java
index d200a578a..e057a40d5 100644
--- a/tests/javatests/com/google/android/material/testutils/TabLayoutActions.java
+++ b/tests/javatests/com/google/android/material/testutils/TabLayoutActions.java
@@ -19,12 +19,12 @@ package com.google.android.material.testutils;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
 
 import androidx.annotation.Nullable;
-import com.google.android.material.tabs.TabLayout;
 import android.view.View;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.viewpager.widget.ViewPager;
+import com.google.android.material.tabs.TabLayout;
 import org.hamcrest.Matcher;
 
 public class TabLayoutActions {
diff --git a/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java b/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java
index 053f6b7f4..ec1b25288 100644
--- a/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java
+++ b/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java
@@ -28,7 +28,6 @@ import androidx.annotation.LayoutRes;
 import androidx.annotation.MenuRes;
 import androidx.annotation.Nullable;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
-import com.google.android.material.tabs.TabLayout;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.TextViewCompat;
 import android.util.SparseArray;
@@ -40,6 +39,7 @@ import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import com.google.android.material.expandable.ExpandableWidget;
 import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.tabs.TabLayout;
 import org.hamcrest.Matcher;
 
 public class TestUtilsActions {