diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index d221fbd81ff..7d71096e962 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -28,8 +28,7 @@ import com.android.settings.system.ResetDashboardFragment;
 /**
  * Controller for erasing Euicc data
  */
-public class EraseEuiccDataController extends BasePreferenceController implements
-        PreferenceControllerMixin {
+public class EraseEuiccDataController extends BasePreferenceController {
     private ResetDashboardFragment mHostFragment;
 
     public EraseEuiccDataController(Context context, String preferenceKey) {
diff --git a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
index 3aee9b1eced..a141f0c7bab 100644
--- a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
+++ b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -67,7 +67,7 @@ public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment imp
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        Fragment fragment = getTargetFragment();
+        final Fragment fragment = getTargetFragment();
         if (!(fragment instanceof ResetDashboardFragment)) {
             Log.e(TAG, "getTargetFragment return unexpected type");
         }
diff --git a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
index 15e470813e6..879b9f70b72 100644
--- a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
@@ -43,7 +43,7 @@ public class EraseEuiccDataControllerTest {
     }
 
     @Test
-    public void getAvailabilityStatus_byDefault_true() {
+    public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
     }