diff --git a/api/current.xml b/api/current.xml
index 830238580becb..f73d9da19ee6a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -120190,22 +120190,11 @@
  visibility="public"
 >
 </field>
-<field name="EXTRA_HEADERS_KEY"
+<field name="EXTRA_HEADERS"
  type="java.lang.String"
  transient="false"
  volatile="false"
- value="&quot;com.android.browser.headers_key&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="EXTRA_HEADERS_VALUE"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;com.android.browser.headers_value&quot;"
+ value="&quot;com.android.browser.headers&quot;"
  static="true"
  final="true"
  deprecated="not deprecated"
diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java
index ef43afe183df3..0b1b16b1d5dc4 100644
--- a/core/java/android/provider/Browser.java
+++ b/core/java/android/provider/Browser.java
@@ -79,25 +79,13 @@ public class Browser {
     public static final String EXTRA_POST_DATA = "com.android.browser.post_data";
 
     /**
-     * The name of the extra data in the VIEW intent. The data is in the format
-     * of String array. This should be paired with EXTRA_HEADERS_VALUE.
-     * <p>
-     * The keys will be combined with the values and sent in the HTTP request
+     * The name of the extra data in the VIEW intent. The data are key/value
+     * pairs in the format of Bundle. They will be sent in the HTTP request
      * headers for the provided url. The keys can't be the standard HTTP headers
      * as they are set by the WebView. The url's schema must be http(s).
      * <p>
      */
-    public static final String EXTRA_HEADERS_KEY = "com.android.browser.headers_key";
-
-    /**
-     * The name of the extra data in the VIEW intent. The data is in the format
-     * of String array. This should be paired with EXTRA_HEADERS_KEY.
-     * <p>
-     * The values will be combined with the keys and sent in the HTTP request
-     * headers for the provided url. The url's schema must be http(s).
-     * <p>
-     */
-    public static final String EXTRA_HEADERS_VALUE = "com.android.browser.headers_value";
+    public static final String EXTRA_HEADERS = "com.android.browser.headers";
 
     /* if you change column order you must also change indices
        below */