diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c1585113ac6..adc16c5f35e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1509,13 +1509,11 @@
             android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
-        <activity android:name=".fingerprint.FingerprintEnrollOnboard" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollIntroduction" android:exported="false" />
 
-        <activity android:name=".fingerprint.SetupFingerprintEnrollOnboard" android:exported="false"/>
         <activity android:name=".fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
         <activity android:name=".fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
         <activity android:name=".fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
diff --git a/res/layout/fingerprint_enroll_onboard.xml b/res/layout/fingerprint_enroll_onboard.xml
deleted file mode 100644
index 4189137c3c5..00000000000
--- a/res/layout/fingerprint_enroll_onboard.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.setupwizardlib.SetupWizardLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setup_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="?attr/fingerprint_layout_theme">
-
-    <LinearLayout
-        style="@style/SuwContentFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:clipToPadding="false"
-        android:clipChildren="false">
-
-        <TextView
-            style="@style/TextAppearance.FingerprintMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/suw_description_margin_top"
-            android:layout_marginBottom="@dimen/suw_description_margin_top"
-            android:text="@string/security_settings_fingerprint_enroll_onboard_message"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="24dp"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_check"
-                android:tint="?android:attr/textColorPrimary" />
-
-            <TextView
-                style="@style/TextAppearance.FingerprintMessage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/security_settings_fingerprint_enroll_onboard_message_1"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="24dp"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_check"
-                android:tint="?android:attr/textColorPrimary" />
-
-            <TextView
-                style="@style/TextAppearance.FingerprintMessage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/security_settings_fingerprint_enroll_onboard_message_2"/>
-
-        </LinearLayout>
-
-        <View
-            android:layout_height="0dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
-
-        <Button
-            style="@style/Button.FingerprintButton"
-            android:id="@+id/next_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginEnd="-12dp"
-            android:layout_gravity="end"
-            android:gravity="end|center_vertical"
-            android:text="@string/security_settings_fingerprint_enroll_setup_screen_lock"/>
-
-    </LinearLayout>
-
-</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89c05ad81ba..c58ecc9f574 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -734,17 +734,6 @@
     </plurals>
     <!-- message shown in summary field when no fingerprints are registered -->
     <string name="security_settings_fingerprint_preference_summary_none"></string>
-    <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
-    <string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
-    <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
-         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
-    <string name="security_settings_fingerprint_enroll_onboard_message">To use your fingerprint to unlock your screen or confirm purchases, you\u2019ll need to:</string>
-    <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
-         the user needs to do. -->
-    <string name="security_settings_fingerprint_enroll_onboard_message_1">Set up your backup screen lock method</string>
-    <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
-         the user needs to do. -->
-    <string name="security_settings_fingerprint_enroll_onboard_message_2">Add your fingerprint</string>
     <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
     <string name="security_settings_fingerprint_enroll_introduction_title">Unlock with fingerprint</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index c1347f53cda..54cd21880d3 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -86,6 +86,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
         if (token != null) {
             intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
         }
+        if (mUserId != UserHandle.USER_NULL) {
+            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
+        }
         startActivityForResult(intent, FINGERPRINT_FIND_SENSOR_REQUEST);
     }
 
@@ -95,9 +98,6 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
 
     protected Intent getFindSensorIntent() {
         Intent intent = new Intent(this, FingerprintEnrollFindSensor.class);
-        if (mUserId != UserHandle.USER_NULL) {
-            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
-        }
         return intent;
     }
 
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
deleted file mode 100644
index 1b80589c17f..00000000000
--- a/src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.fingerprint;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Bundle;
-import android.os.UserHandle;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.R;
-
-/**
- * Onboarding activity for fingerprint enrollment.
- */
-public class FingerprintEnrollOnboard extends FingerprintEnrollBase {
-
-    private static final int CHOOSE_LOCK_GENERIC_REQUEST = 1;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fingerprint_enroll_onboard);
-        setHeaderText(R.string.security_settings_fingerprint_enroll_onboard_title);
-    }
-
-    @Override
-    protected void onNextButtonClick() {
-        launchChooseLock();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST && resultCode == RESULT_FINISHED) {
-            byte[] token = data.getByteArrayExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
-            setResult(RESULT_FINISHED);
-            launchFindSensor(token);
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    private void launchChooseLock() {
-        Intent intent = getChooseLockIntent();
-        long challenge = getSystemService(FingerprintManager.class).preEnroll();
-        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
-                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true);
-        if (mUserId != UserHandle.USER_NULL) {
-            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
-        }
-        startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
-    }
-
-    protected Intent getChooseLockIntent() {
-        return new Intent(this, ChooseLockGeneric.class);
-    }
-
-    private void launchFindSensor(byte[] token) {
-        Intent intent = getFindSensorIntent();
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
-        if (mUserId != UserHandle.USER_NULL) {
-            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
-        }
-        startActivity(intent);
-        finish();
-    }
-
-    protected Intent getFindSensorIntent() {
-        return new Intent(this, FingerprintEnrollFindSensor.class);
-    }
-
-    @Override
-    protected int getMetricsCategory() {
-        return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD;
-    }
-}
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index 505d140a9c4..74a280c874a 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -18,6 +18,7 @@ package com.android.settings.fingerprint;
 
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.UserHandle;
 import android.view.View;
 import android.widget.Button;
 
@@ -39,6 +40,9 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
     protected Intent getEnrollingIntent() {
         Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+        if (mUserId != UserHandle.USER_NULL) {
+            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
+        }
         SetupWizardUtils.copySetupExtras(getIntent(), intent);
         return intent;
     }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
index 8f37a111a2d..bbd0c1a3cdf 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
@@ -18,6 +18,7 @@ package com.android.settings.fingerprint;
 
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.UserHandle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -35,6 +36,9 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish
     protected Intent getEnrollingIntent() {
         Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+        if (mUserId != UserHandle.USER_NULL) {
+            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
+        }
         SetupWizardUtils.copySetupExtras(getIntent(), intent);
         return intent;
     }
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
deleted file mode 100644
index 7fca35a1a19..00000000000
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollOnboard.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.fingerprint;
-
-import android.content.Intent;
-import android.content.res.Resources;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.internal.logging.MetricsLogger;
-import com.android.settings.R;
-import com.android.settings.SetupChooseLockGeneric;
-import com.android.settings.SetupWizardUtils;
-import com.android.setupwizardlib.view.NavigationBar;
-
-public class SetupFingerprintEnrollOnboard extends FingerprintEnrollOnboard
-        implements NavigationBar.NavigationBarListener {
-
-    @Override
-    protected Intent getChooseLockIntent() {
-        Intent intent = new Intent(this, SetupChooseLockGeneric.class);
-        SetupWizardUtils.copySetupExtras(getIntent(), intent);
-        return intent;
-    }
-
-    @Override
-    protected Intent getFindSensorIntent() {
-        final Intent intent = new Intent(this, SetupFingerprintEnrollFindSensor.class);
-        SetupWizardUtils.copySetupExtras(getIntent(), intent);
-        return intent;
-    }
-
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
-    @Override
-    protected void initViews() {
-        SetupWizardUtils.setImmersiveMode(this);
-
-        final View nextButton = findViewById(R.id.next_button);
-        if (nextButton != null) {
-            nextButton.setVisibility(View.GONE);
-        }
-
-        getNavigationBar().setNavigationBarListener(this);
-    }
-
-    @Override
-    protected Button getNextButton() {
-        return getNavigationBar().getNextButton();
-    }
-
-    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
-        onNextButtonClick();
-    }
-
-    @Override
-    protected int getMetricsCategory() {
-        return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD_SETUP;
-    }
-}