diff --git a/Android.bp b/Android.bp
index 755ba1d..68da5c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,8 @@
         ":ThemePicker_srcs",
         "src_override/**/*.java",
         "src_override/**/*.kt",
+        "src_overridecustom/**/*.java",
+        "src_overridecustom/**/*.kt",
     ],
 
     use_embedded_native_libs: true,
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java
similarity index 98%
rename from src/com/android/customization/picker/CustomizationPickerActivity.java
rename to src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java
index 1d6fa9b..f1f1e72 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src_overridecustom/com/android/customization/picker/CustomizationPickerActivity.java
@@ -291,7 +291,7 @@
         mBottomNav = findViewById(R.id.main_bottom_nav);
         Menu menu = mBottomNav.getMenu();
         DefaultCustomizationPreferences prefs =
-            new DefaultCustomizationPreferences(getApplicationContext());
+                new DefaultCustomizationPreferences(getApplicationContext());
         for (int i = menu.size() - 1; i >= 0; i--) {
             MenuItem item = menu.getItem(i);
             int id = item.getItemId();
@@ -327,7 +327,7 @@
 
         // Position dot in the upper-right corner
         int dotSize = (int) getResources().getDimension(R.dimen.tip_dot_size)
-            + (int) getResources().getDimension(R.dimen.tip_dot_line_width) * 2;
+                + (int) getResources().getDimension(R.dimen.tip_dot_line_width) * 2;
         int linewidth = (int) getResources().getDimension(R.dimen.tip_dot_line_width);
         iconWithDot.setLayerGravity(1, Gravity.TOP | Gravity.RIGHT);
         iconWithDot.setLayerWidth(1, dotSize);