diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 638a2b5..4b311c1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3244,6 +3244,19 @@
                        android:resource="@string/gesture_preference_summary"/>
         </activity-alias>
 
+        <activity-alias android:name="PrivacyDashboardAlias"
+            android:targetActivity="Settings$PrivacySettingsActivity">
+            <intent-filter android:priority="60">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                       android:value="com.android.settings.category.ia.system" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.PrivacySettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity-alias>
+
         <activity-alias android:name="BackupResetDashboardAlias"
                         android:targetActivity="Settings$PrivacySettingsActivity">
             <intent-filter android:priority="60">
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index eff2004..3813c42 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1189,6 +1189,10 @@
         boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
         setTileEnabled(new ComponentName(packageName,
                 Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm);
+        setTileEnabled(new ComponentName(packageName,
+                        "com.android.settings.PrivacyDashboardAlias"),
+                useDefaultBackup, isAdmin, pm);
+
         boolean hasBackupActivity = false;
         if (!useDefaultBackup) {
             try {
