diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java
index 0e45433..9518b73 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java
@@ -22,22 +22,22 @@
 import android.graphics.Rect;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 import android.view.MotionEvent;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collections;
-import java.util.List;
-
 import androidx.recyclerview.selection.testing.TestAdapter;
 import androidx.recyclerview.selection.testing.TestAutoScroller;
 import androidx.recyclerview.selection.testing.TestBandPredicate;
 import androidx.recyclerview.selection.testing.TestData;
 import androidx.recyclerview.selection.testing.TestEvents.Builder;
 import androidx.recyclerview.selection.testing.TestItemKeyProvider;
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java
index 5db27f9..525c264 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java
@@ -26,6 +26,13 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseBooleanArray;
 
+import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
+import androidx.recyclerview.selection.testing.Bundles;
+import androidx.recyclerview.selection.testing.SelectionProbe;
+import androidx.recyclerview.selection.testing.TestAdapter;
+import androidx.recyclerview.selection.testing.TestItemKeyProvider;
+import androidx.recyclerview.selection.testing.TestSelectionObserver;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,13 +42,6 @@
 import java.util.List;
 import java.util.Set;
 
-import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
-import androidx.recyclerview.selection.testing.Bundles;
-import androidx.recyclerview.selection.testing.SelectionProbe;
-import androidx.recyclerview.selection.testing.TestAdapter;
-import androidx.recyclerview.selection.testing.TestItemKeyProvider;
-import androidx.recyclerview.selection.testing.TestSelectionObserver;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class DefaultSelectionTrackerTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java
index 43a9bb5..d5ed06d 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java
@@ -21,17 +21,17 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import androidx.recyclerview.selection.testing.SelectionProbe;
+import androidx.recyclerview.selection.testing.TestAdapter;
+import androidx.recyclerview.selection.testing.TestItemKeyProvider;
+import androidx.recyclerview.selection.testing.TestSelectionObserver;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.List;
 
-import androidx.recyclerview.selection.testing.SelectionProbe;
-import androidx.recyclerview.selection.testing.TestAdapter;
-import androidx.recyclerview.selection.testing.TestItemKeyProvider;
-import androidx.recyclerview.selection.testing.TestSelectionObserver;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class DefaultSelectionTracker_SingleSelectTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java
index 0e5a5a9..3e8cf82 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java
@@ -27,14 +27,14 @@
 import android.view.GestureDetector.OnGestureListener;
 import android.view.MotionEvent;
 
+import androidx.recyclerview.selection.testing.TestEvents.Mouse;
+import androidx.recyclerview.selection.testing.TestEvents.Touch;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 
-import androidx.recyclerview.selection.testing.TestEvents.Mouse;
-import androidx.recyclerview.selection.testing.TestEvents.Touch;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public final class GestureRouterTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java
index 562eca3..4c10930 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java
@@ -22,17 +22,17 @@
 
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.MotionEvent;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import androidx.recyclerview.selection.testing.SelectionProbe;
 import androidx.recyclerview.selection.testing.SelectionTrackers;
 import androidx.recyclerview.selection.testing.TestAutoScroller;
 import androidx.recyclerview.selection.testing.TestEvents;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java
index 7e5251a..2499682 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java
@@ -24,12 +24,12 @@
 import android.view.MotionEvent;
 import android.view.View;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import androidx.recyclerview.selection.GestureSelectionHelper.RecyclerViewDelegate;
 import androidx.recyclerview.selection.testing.TestEvents;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class GestureSelectionHelper_RecyclerViewDelegateTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java
index 334d89a..f639307 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java
@@ -16,16 +16,19 @@
 
 package androidx.recyclerview.selection;
 
+import static androidx.recyclerview.selection.GridModel.NOT_SET;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import static androidx.recyclerview.selection.GridModel.NOT_SET;
-
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+
+import androidx.recyclerview.selection.testing.TestAdapter;
+import androidx.recyclerview.selection.testing.TestItemKeyProvider;
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 
 import org.junit.After;
@@ -38,9 +41,6 @@
 
 import javax.annotation.Nullable;
 
-import androidx.recyclerview.selection.testing.TestAdapter;
-import androidx.recyclerview.selection.testing.TestItemKeyProvider;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class GridModelTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java
index 2632a29..cabe53b 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java
@@ -16,9 +16,6 @@
 
 package androidx.recyclerview.selection;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import static androidx.recyclerview.selection.testing.TestEvents.Mouse.ALT_CLICK;
 import static androidx.recyclerview.selection.testing.TestEvents.Mouse.CLICK;
 import static androidx.recyclerview.selection.testing.TestEvents.Mouse.CTRL_CLICK;
@@ -26,15 +23,13 @@
 import static androidx.recyclerview.selection.testing.TestEvents.Mouse.SHIFT_CLICK;
 import static androidx.recyclerview.selection.testing.TestEvents.Mouse.TERTIARY_CLICK;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.MotionEvent;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import androidx.recyclerview.selection.testing.SelectionProbe;
 import androidx.recyclerview.selection.testing.SelectionTrackers;
 import androidx.recyclerview.selection.testing.TestAdapter;
@@ -46,6 +41,11 @@
 import androidx.recyclerview.selection.testing.TestItemKeyProvider;
 import androidx.recyclerview.selection.testing.TestOnContextClickListener;
 import androidx.recyclerview.selection.testing.TestOnItemActivatedListener;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java
index 9e951c4..a355f2e 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java
@@ -23,10 +23,6 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import androidx.recyclerview.selection.testing.SelectionProbe;
 import androidx.recyclerview.selection.testing.SelectionTrackers;
 import androidx.recyclerview.selection.testing.TestAdapter;
@@ -38,6 +34,10 @@
 import androidx.recyclerview.selection.testing.TestOnContextClickListener;
 import androidx.recyclerview.selection.testing.TestOnItemActivatedListener;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * MouseInputDelegate / SelectHelper integration test covering the shared
  * responsibility of range selection.
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java
index 700180c..e2919f4 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java
@@ -16,14 +16,16 @@
 
 package androidx.recyclerview.selection;
 
-import static org.junit.Assert.assertEquals;
-
 import static androidx.recyclerview.selection.Range.TYPE_PRIMARY;
 import static androidx.recyclerview.selection.Range.TYPE_PROVISIONAL;
 
+import static org.junit.Assert.assertEquals;
+
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import androidx.recyclerview.selection.testing.TestData;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,8 +33,6 @@
 import java.util.List;
 import java.util.Stack;
 
-import androidx.recyclerview.selection.testing.TestData;
-
 /**
  * MouseInputDelegate / SelectHelper integration test covering the shared
  * responsibility of range selection.
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java
index 6265e08..2715d0b 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java
@@ -22,13 +22,13 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import androidx.recyclerview.selection.testing.Bundles;
+import androidx.recyclerview.selection.testing.SelectionTrackers;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.recyclerview.selection.testing.Bundles;
-import androidx.recyclerview.selection.testing.SelectionTrackers;
-
 /**
  * Tests guaranteeing that two distinct selections can be stored side-by-side.
  */
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java
index 5ac3ce8..3a26895 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java
@@ -22,12 +22,12 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import androidx.recyclerview.selection.testing.Bundles;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.recyclerview.selection.testing.Bundles;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public final class StorageStrategy_LongTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java
index 506bf3d..1234023 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java
@@ -23,6 +23,8 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import androidx.recyclerview.selection.testing.Bundles;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,8 +32,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.recyclerview.selection.testing.Bundles;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public final class StorageStrategy_ParcelableTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java
index 20e31fe..5d680de 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java
@@ -22,12 +22,12 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import androidx.recyclerview.selection.testing.Bundles;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.recyclerview.selection.testing.Bundles;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public final class StorageStrategy_StringTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java
index 53dcce7..c6e6475 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java
@@ -16,21 +16,14 @@
 
 package androidx.recyclerview.selection;
 
-import static org.junit.Assert.assertFalse;
-
 import static androidx.recyclerview.selection.testing.TestEvents.Touch.TAP;
 
+import static org.junit.Assert.assertFalse;
+
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.MotionEvent;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
 import androidx.recyclerview.selection.testing.SelectionProbe;
 import androidx.recyclerview.selection.testing.SelectionTrackers;
@@ -42,6 +35,13 @@
 import androidx.recyclerview.selection.testing.TestOnItemActivatedListener;
 import androidx.recyclerview.selection.testing.TestRunnable;
 import androidx.recyclerview.selection.testing.TestSelectionPredicate;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java
index 4cca06c..1aaf495 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java
@@ -21,16 +21,16 @@
 import static org.junit.Assert.assertNull;
 
 import android.graphics.Point;
-import androidx.annotation.Nullable;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.selection.ViewAutoScroller.ScrollHost;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.recyclerview.selection.ViewAutoScroller.ScrollHost;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public final class ViewAutoScrollerTest {
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestAdapter.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestAdapter.java
index fe79264..bdf0458 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestAdapter.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestAdapter.java
@@ -18,17 +18,17 @@
 
 import static org.junit.Assert.assertTrue;
 
+import android.view.ViewGroup;
+
+import androidx.recyclerview.selection.SelectionTracker;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.Adapter;
 import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-import android.view.ViewGroup;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import androidx.recyclerview.selection.SelectionTracker;
-
 public class TestAdapter<K> extends Adapter<TestHolder> {
 
     private final List<K> mItems = new ArrayList<>();
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestEvents.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestEvents.java
index 686cbd4..285c4db 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestEvents.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestEvents.java
@@ -17,12 +17,13 @@
 package androidx.recyclerview.selection.testing;
 
 import android.graphics.Point;
-import androidx.annotation.IntDef;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.MotionEvent.PointerCoords;
 import android.view.MotionEvent.PointerProperties;
 
+import androidx.annotation.IntDef;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashSet;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestFocusDelegate.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestFocusDelegate.java
index bbbb7d8..75ca592 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestFocusDelegate.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestFocusDelegate.java
@@ -18,10 +18,9 @@
 
 import static org.junit.Assert.assertEquals;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 import androidx.recyclerview.selection.FocusDelegate;
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
+import androidx.recyclerview.widget.RecyclerView;
 
 public final class TestFocusDelegate<K> extends FocusDelegate<K> {
 
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestHolder.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestHolder.java
index 8d202e2..055d102 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestHolder.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestHolder.java
@@ -16,9 +16,10 @@
 
 package androidx.recyclerview.selection.testing;
 
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 public class TestHolder extends ViewHolder {
     public TestHolder(View itemView) {
         super(itemView);
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetails.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetails.java
index 282273e..88c1ca9 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetails.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetails.java
@@ -16,10 +16,10 @@
 
 package androidx.recyclerview.selection.testing;
 
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.MotionEvent;
 
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
+import androidx.recyclerview.widget.RecyclerView;
 
 public final class TestItemDetails extends ItemDetails<String> {
 
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetailsLookup.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetailsLookup.java
index c201575..2b23338 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetailsLookup.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestItemDetailsLookup.java
@@ -18,10 +18,10 @@
 
 import android.view.MotionEvent;
 
-import javax.annotation.Nullable;
-
 import androidx.recyclerview.selection.ItemDetailsLookup;
 
+import javax.annotation.Nullable;
+
 /**
  * Test impl of ItemDetailsLookup.
  */
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestSelectionObserver.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestSelectionObserver.java
index 91be62a..5789980 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestSelectionObserver.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/testing/TestSelectionObserver.java
@@ -20,11 +20,11 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import androidx.recyclerview.selection.SelectionTracker.SelectionObserver;
+
 import java.util.HashSet;
 import java.util.Set;
 
-import androidx.recyclerview.selection.SelectionTracker.SelectionObserver;
-
 public class TestSelectionObserver<K> extends SelectionObserver<K> {
 
     private final Set<K> mSelected = new HashSet<>();
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/AutoScroller.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/AutoScroller.java
index f1608a4..c3112c4 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/AutoScroller.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/AutoScroller.java
@@ -19,6 +19,7 @@
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 
 import android.graphics.Point;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
 
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandPredicate.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandPredicate.java
index eef557f..c4a5425 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandPredicate.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandPredicate.java
@@ -18,13 +18,14 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 
+import android.view.MotionEvent;
+import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.MotionEvent;
-import android.view.View;
 
 /**
  * Provides a means of controlling when and where band selection can be initiated.
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandSelectionHelper.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandSelectionHelper.java
index 8c39f4e..883fcbf 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandSelectionHelper.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/BandSelectionHelper.java
@@ -18,25 +18,24 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 import static androidx.core.util.Preconditions.checkState;
-
 import static androidx.recyclerview.selection.Shared.VERBOSE;
 
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.util.Log;
+import android.view.MotionEvent;
+
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
-import android.util.Log;
-import android.view.MotionEvent;
 
 import java.util.Set;
 
-import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
-
 /**
  * Provides mouse driven band-selection support when used in conjunction with a {@link RecyclerView}
  * instance. This class is responsible for rendering a band overlay and manipulating selection
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultBandHost.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultBandHost.java
index ec8da92..7aa7cd0 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultBandHost.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultBandHost.java
@@ -22,15 +22,15 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.view.View;
+
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
-import android.view.View;
-
-import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
 
 /**
  * RecyclerView backed {@link BandSelectionHelper.BandHost}.
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java
index ef8c56e..c7be1b8 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java
@@ -19,24 +19,23 @@
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 import static androidx.core.util.Preconditions.checkArgument;
 import static androidx.core.util.Preconditions.checkState;
-
 import static androidx.recyclerview.selection.Shared.DEBUG;
 
 import android.os.Bundle;
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.selection.Range.RangeType;
 import androidx.recyclerview.widget.RecyclerView;
-import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import androidx.recyclerview.selection.Range.RangeType;
-
 /**
  * {@link SelectionTracker} providing support for traditional multi-item selection on top
  * of {@link RecyclerView}.
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/EventBridge.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/EventBridge.java
index 2d6db38..6089ec6 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/EventBridge.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/EventBridge.java
@@ -18,15 +18,15 @@
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 import static androidx.core.util.Preconditions.checkArgument;
-
 import static androidx.recyclerview.selection.Shared.VERBOSE;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
-import android.util.Log;
 
 /**
  * Provides the necessary glue to notify RecyclerView when selection data changes,
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/FocusDelegate.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/FocusDelegate.java
index 9be6ae2..ca69c85 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/FocusDelegate.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/FocusDelegate.java
@@ -17,9 +17,8 @@
 package androidx.recyclerview.selection;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Override methods in this class to provide application specific behaviors
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureRouter.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureRouter.java
index 8dc5067..797f32d 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureRouter.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureRouter.java
@@ -18,13 +18,14 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.view.GestureDetector.OnDoubleTapListener;
 import android.view.GestureDetector.OnGestureListener;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * GestureRouter is responsible for routing gestures detected by a GestureDetector
  * to registered handlers. The primary function is to divide events by tool-type
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
index 91a46d1..a780bda 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GestureSelectionHelper.java
@@ -20,14 +20,15 @@
 import static androidx.core.util.Preconditions.checkState;
 
 import android.graphics.Point;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
 
 /**
  * GestureSelectionHelper provides logic that interprets a combination
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GridModel.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GridModel.java
index adefb89..f496b0c 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GridModel.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/GridModel.java
@@ -20,24 +20,24 @@
 
 import android.graphics.Point;
 import android.graphics.Rect;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
-
 /**
  * Provides a band selection item model for views within a RecyclerView. This class queries the
  * RecyclerView to determine where its items are placed; then, once band selection is underway,
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemDetailsLookup.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemDetailsLookup.java
index 27f2caf..9cb6d34 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemDetailsLookup.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemDetailsLookup.java
@@ -16,10 +16,11 @@
 
 package androidx.recyclerview.selection;
 
+import android.view.MotionEvent;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.MotionEvent;
 
 /**
  * The Selection library calls {@link #getItemDetails(MotionEvent)} when it needs
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemKeyProvider.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemKeyProvider.java
index 9d8199b..a216b24 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemKeyProvider.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ItemKeyProvider.java
@@ -21,12 +21,11 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 /**
  * Provides selection library access to stable selection keys identifying items
  * presented by a {@link RecyclerView RecyclerView} instance.
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionEvents.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionEvents.java
index bd83183..90d79e6 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionEvents.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionEvents.java
@@ -17,10 +17,11 @@
 package androidx.recyclerview.selection;
 
 import android.graphics.Point;
-import androidx.annotation.NonNull;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
+
 /**
  * Utility methods for working with {@link MotionEvent} instances.
  */
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionInputHandler.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionInputHandler.java
index 1fb5eaa..a7eb208 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionInputHandler.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MotionInputHandler.java
@@ -19,13 +19,13 @@
 import static androidx.core.util.Preconditions.checkArgument;
 import static androidx.core.util.Preconditions.checkState;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Base class for handlers that can be registered w/ {@link GestureRouter}.
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MouseInputHandler.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MouseInputHandler.java
index f40ce04..ca45137 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MouseInputHandler.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/MouseInputHandler.java
@@ -18,17 +18,16 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 import static androidx.core.util.Preconditions.checkState;
-
 import static androidx.recyclerview.selection.Shared.DEBUG;
 import static androidx.recyclerview.selection.Shared.VERBOSE;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * A MotionInputHandler that provides the high-level glue for mouse driven selection. This
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnContextClickListener.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnContextClickListener.java
index 40ed086..b7e432e 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnContextClickListener.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnContextClickListener.java
@@ -16,9 +16,10 @@
 
 package androidx.recyclerview.selection;
 
-import androidx.annotation.NonNull;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
+
 /**
  * Override methods in this class to provide application specific behaviors
  * related to mouse input.
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnDragInitiatedListener.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnDragInitiatedListener.java
index f1b272e..a479872 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnDragInitiatedListener.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnDragInitiatedListener.java
@@ -16,9 +16,10 @@
 
 package androidx.recyclerview.selection;
 
-import androidx.annotation.NonNull;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
+
 /**
  * Register an OnDragInitiatedListener to be notified of potential drag operations,
  * and to handle them.
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnItemActivatedListener.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnItemActivatedListener.java
index 809c4ae..60c41c6 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnItemActivatedListener.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OnItemActivatedListener.java
@@ -16,9 +16,9 @@
 
 package androidx.recyclerview.selection;
 
-import androidx.annotation.NonNull;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
 
 /**
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OperationMonitor.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OperationMonitor.java
index bae14a8..f5a4508 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OperationMonitor.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/OperationMonitor.java
@@ -18,18 +18,17 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 import static androidx.core.util.Preconditions.checkState;
-
 import static androidx.recyclerview.selection.Shared.DEBUG;
 
+import android.util.Log;
+
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
-import android.util.Log;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 /**
  * OperationMonitor provides a mechanism to coordinate application
  * logic with ongoing user selection activities (such as active band selection
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/Range.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/Range.java
index 4337731..35fb3a8 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/Range.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/Range.java
@@ -17,13 +17,13 @@
 package androidx.recyclerview.selection;
 
 import static androidx.core.util.Preconditions.checkArgument;
+import static androidx.recyclerview.selection.Shared.DEBUG;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
-import static androidx.recyclerview.selection.Shared.DEBUG;
+import android.util.Log;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
-import android.util.Log;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionPredicates.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionPredicates.java
index 6067f9f..1e13bde 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionPredicates.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionPredicates.java
@@ -17,7 +17,6 @@
 package androidx.recyclerview.selection;
 
 import androidx.annotation.NonNull;
-
 import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
 
 /**
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionTracker.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionTracker.java
index 3f30432..2b35f5d 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionTracker.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/SelectionTracker.java
@@ -21,13 +21,14 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.view.GestureDetector;
+import android.view.HapticFeedbackConstants;
+import android.view.MotionEvent;
+
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.GestureDetector;
-import android.view.HapticFeedbackConstants;
-import android.view.MotionEvent;
 
 import java.util.Set;
 
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StableIdKeyProvider.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StableIdKeyProvider.java
index 9fa874e..0478293 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StableIdKeyProvider.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StableIdKeyProvider.java
@@ -16,12 +16,13 @@
 
 package androidx.recyclerview.selection;
 
+import android.util.SparseArray;
+import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener;
-import android.util.SparseArray;
-import android.view.View;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StorageStrategy.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StorageStrategy.java
index 5bb3a52..a27752f 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StorageStrategy.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/StorageStrategy.java
@@ -20,6 +20,7 @@
 
 import android.os.Bundle;
 import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ToolHandlerRegistry.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ToolHandlerRegistry.java
index 61b145e..8fc82c6 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ToolHandlerRegistry.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ToolHandlerRegistry.java
@@ -19,9 +19,10 @@
 import static androidx.core.util.Preconditions.checkArgument;
 import static androidx.core.util.Preconditions.checkState;
 
+import android.view.MotionEvent;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.view.MotionEvent;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchEventRouter.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchEventRouter.java
index 45aef48..a5501da 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchEventRouter.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchEventRouter.java
@@ -18,11 +18,12 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
 
 /**
  * A class responsible for routing MotionEvents to tool-type specific handlers,
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchInputHandler.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchInputHandler.java
index a0d6a4a..271ff3c 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchInputHandler.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/TouchInputHandler.java
@@ -18,13 +18,13 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.MotionEvent;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
 import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * A MotionInputHandler that provides the high-level glue for touch driven selection. This class
diff --git a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ViewAutoScroller.java b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ViewAutoScroller.java
index add4d6a..b7618d1 100644
--- a/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ViewAutoScroller.java
+++ b/recyclerview-selection/src/main/java/androidx/recyclerview/selection/ViewAutoScroller.java
@@ -18,17 +18,17 @@
 
 import static androidx.core.util.Preconditions.checkArgument;
 import static androidx.core.util.Preconditions.checkState;
-
 import static androidx.recyclerview.selection.Shared.DEBUG;
 import static androidx.recyclerview.selection.Shared.VERBOSE;
 
 import android.graphics.Point;
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import android.util.Log;
 
 /**
  * Provides auto-scrolling upon request when user's interaction with the application