diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 0f65f898c40..ca6d7644689 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -92,3 +92,17 @@ com.android.settings.qstile.DevelopmentTileConfigActivity$DevelopmentTileConfigF
 com.android.settings.applications.ExternalSourcesDetails
 com.android.settings.applications.PictureInPictureSettings
 com.android.settings.applications.PictureInPictureDetails
+com.android.settings.ApnSettings
+com.android.settings.SecuritySettings$SecuritySubSettings
+com.android.settings.PrivacySettings
+com.android.settings.WifiCallingSettings
+com.android.settings.SetupChooseLockGeneric$SetupChooseLockGenericFragment
+com.android.settings.SetupRedactionInterstitial$SetupRedactionInterstitialFragment
+com.android.settings.TrustAgentSettings
+com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment
+com.android.settings.IccLockSettings
+com.android.settings.TetherSettings
+com.android.settings.ApplicationSettings
+com.android.settings.ApnEditor
+com.android.settings.UserCredentialsSettings
+com.android.settings.TestingSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable
index c1f0d6096be..649f617c180 100644
--- a/tests/robotests/assets/grandfather_not_implementing_instrumentable
+++ b/tests/robotests/assets/grandfather_not_implementing_instrumentable
@@ -3,3 +3,11 @@ com.android.settings.core.lifecycle.ObservableDialogFragment
 com.android.settings.core.lifecycle.ObservableFragment
 com.android.settings.applications.AppOpsCategory
 com.android.settings.inputmethod.UserDictionaryLocalePicker
+com.android.settings.CustomEditTextPreference$CustomPreferenceDialogFragment
+com.android.settings.CustomListPreference$CustomListPreferenceDialogFragment
+com.android.settings.ChooseLockPassword$SaveAndFinishWorker
+com.android.settings.ChooseLockPattern$SaveAndFinishWorker
+com.android.settings.RestrictedListPreference$RestrictedListPreferenceDialogFragment
+com.android.settings.CustomDialogPreference$CustomPreferenceDialogFragment
+com.android.settings.ConfirmDeviceCredentialBaseFragment$LastTryDialog
+com.android.settings.CredentialCheckResultTracker
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
index 2f786f8acf4..a957ce497a0 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.core.codeinspection;
 
-import com.google.common.truth.Truth;
-
-import org.junit.Assert;
 import org.robolectric.shadows.ShadowApplication;
 
 import java.io.BufferedReader;
@@ -56,7 +53,7 @@ public abstract class CodeInspector {
         }
         final String packageName = clazz.getPackage().getName();
         // Classes that are not in Settings
-        if (!packageName.contains(PACKAGE_NAME + ".")) {
+        if (!packageName.contains(PACKAGE_NAME + ".") && !packageName.endsWith(PACKAGE_NAME)) {
             return false;
         }
         final String className = clazz.getName();