diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d4ec7701c85..da536d3e53c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1081,6 +1081,16 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name=".datausage.AppDataUsageActivity"
+                android:taskAffinity=""
+                android:noHistory="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
                 android:label="@string/high_power_apps"
                 android:taskAffinity=""
diff --git a/src/com/android/settings/datausage/AppDataUsageActivity.java b/src/com/android/settings/datausage/AppDataUsageActivity.java
new file mode 100644
index 00000000000..6f88d454d47
--- /dev/null
+++ b/src/com/android/settings/datausage/AppDataUsageActivity.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2016 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.datausage;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.AppItem;
+
+/**
+ * Standalone activity used to launch {@link AppDataUsage} from a
+ * {@link Settings#ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS} intent.
+ */
+public class AppDataUsageActivity extends SettingsActivity {
+
+    private static final boolean DEBUG = false;
+    private static final String TAG = "AppDataUsageActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        final Intent intent = getIntent();
+        final String packageName = intent.getData().getSchemeSpecificPart();
+        final PackageManager pm = getPackageManager();
+        final int uid;
+        try {
+            uid = pm.getPackageUid(packageName, 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "invalid package: " + packageName);
+            try {
+                // Activity lifecycle still requires calling onCreate()
+                super.onCreate(savedInstanceState);
+            } catch (Exception e2) {
+                // Ignore - most likely caused by SettingsActivity because of invalid fragment
+                if (DEBUG) Log.d(TAG, "onCreate() exception", e);
+            } finally {
+                finish();
+            }
+            return;
+        }
+        if (DEBUG) Log.d(TAG, "Package: " + packageName + " UID: " + uid);
+
+        final Bundle args = new Bundle();
+        final AppItem appItem = new AppItem(uid);
+        appItem.addUid(uid);
+        args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem);
+        intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+        intent.putExtra(EXTRA_SHOW_FRAGMENT, AppDataUsage.class.getName());
+
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return super.isValidFragment(fragmentName)
+                || AppDataUsage.class.getName().equals(fragmentName);
+    }
+}