diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c8a58a8999d..a08c7a49f9c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3046,6 +3046,12 @@
             </intent-filter>
         </service>
 
+        <activity android:name=".HelpTrampoline"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:permission="android.permission.DUMP"
+            android:enabled="@bool/config_has_help" />
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 233c13f00c2..1cbe1dace5c 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -46,4 +46,7 @@
 
     <!--Whether the storage manager exists. -->
     <bool name="config_has_storage_manager">false</bool>
+
+    <!--Whether help links are defined. -->
+    <bool name="config_has_help">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b3b3226d71d..cbe581fa25c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5674,6 +5674,8 @@
     <string name="help_url_gestures" translatable="false"></string>
     <!-- Help URL, Manage Storage [DO NOT TRANSLATE]-->
     <string name="help_url_manage_storage" translatable="false"></string>
+    <!-- Help URL, Android is upgrading [DO NOT TRANSLATE] -->
+    <string name="help_url_upgrading" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>
diff --git a/src/com/android/settings/HelpTrampoline.java b/src/com/android/settings/HelpTrampoline.java
new file mode 100644
index 00000000000..7eb28a07051
--- /dev/null
+++ b/src/com/android/settings/HelpTrampoline.java
@@ -0,0 +1,51 @@
+/*
+ * 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;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.settingslib.HelpUtils;
+
+public class HelpTrampoline extends Activity {
+    private static final String TAG = "HelpTrampoline";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        try {
+            final String name = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+            final int id = getResources().getIdentifier(name, "string", getPackageName());
+            final String value = getResources().getString(id);
+
+            final Intent intent = HelpUtils.getHelpIntent(this, value, null);
+            if (intent != null) {
+                startActivity(intent);
+            }
+
+        } catch (Resources.NotFoundException | ActivityNotFoundException e) {
+            Log.w(TAG, "Failed to resolve help", e);
+        }
+
+        finish();
+    }
+}