diff --git a/android/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java b/android/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java
index 28fd61a28d98..9c387ebda117 100755
--- a/android/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java
+++ b/android/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java
@@ -23,7 +23,6 @@
 /** Parser for a map of reversed domain names stored as a serialized radix tree. */
 @GwtCompatible
 final class TrieParser {
-
   private static final Joiner PREFIX_JOINER = Joiner.on("");
 
   /**
@@ -35,9 +34,7 @@ static ImmutableMap<String, PublicSuffixType> parseTrie(CharSequence encoded) {
     int encodedLen = encoded.length();
     int idx = 0;
     while (idx < encodedLen) {
-      idx +=
-          doParseTrieToBuilder(
-              Lists.<CharSequence>newLinkedList(), encoded.subSequence(idx, encodedLen), builder);
+      idx += doParseTrieToBuilder(Lists.<CharSequence>newLinkedList(), encoded, idx, builder);
     }
     return builder.build();
   }
@@ -48,16 +45,18 @@ static ImmutableMap<String, PublicSuffixType> parseTrie(CharSequence encoded) {
    * @param stack The prefixes that precede the characters represented by this node. Each entry of
    *     the stack is in reverse order.
    * @param encoded The serialized trie.
+   * @param start An index in the encoded serialized trie to begin reading characters from.
    * @param builder A map builder to which all entries will be added.
    * @return The number of characters consumed from {@code encoded}.
    */
   private static int doParseTrieToBuilder(
       List<CharSequence> stack,
       CharSequence encoded,
+      int start,
       ImmutableMap.Builder<String, PublicSuffixType> builder) {
 
     int encodedLen = encoded.length();
-    int idx = 0;
+    int idx = start;
     char c = '\0';
 
     // Read all of the characters for this node.
@@ -68,7 +67,7 @@ private static int doParseTrieToBuilder(
       }
     }
 
-    stack.add(0, reverse(encoded.subSequence(0, idx)));
+    stack.add(0, reverse(encoded.subSequence(start, idx)));
 
     if (c == '!' || c == '?' || c == ':' || c == ',') {
       // '!' represents an interior node that represents a REGISTRY entry in the map.
@@ -85,7 +84,7 @@ private static int doParseTrieToBuilder(
     if (c != '?' && c != ',') {
       while (idx < encodedLen) {
         // Read all the children
-        idx += doParseTrieToBuilder(stack, encoded.subSequence(idx, encodedLen), builder);
+        idx += doParseTrieToBuilder(stack, encoded, idx, builder);
         if (encoded.charAt(idx) == '?' || encoded.charAt(idx) == ',') {
           // An extra '?' or ',' after a child node indicates the end of all children of this node.
           idx++;
@@ -94,7 +93,7 @@ private static int doParseTrieToBuilder(
       }
     }
     stack.remove(0);
-    return idx;
+    return idx - start;
   }
 
   private static CharSequence reverse(CharSequence s) {
diff --git a/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java b/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java
index 28fd61a28d98..9c387ebda117 100644
--- a/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java
+++ b/guava/src/com/google/thirdparty/publicsuffix/TrieParser.java
@@ -23,7 +23,6 @@
 /** Parser for a map of reversed domain names stored as a serialized radix tree. */
 @GwtCompatible
 final class TrieParser {
-
   private static final Joiner PREFIX_JOINER = Joiner.on("");
 
   /**
@@ -35,9 +34,7 @@ static ImmutableMap<String, PublicSuffixType> parseTrie(CharSequence encoded) {
     int encodedLen = encoded.length();
     int idx = 0;
     while (idx < encodedLen) {
-      idx +=
-          doParseTrieToBuilder(
-              Lists.<CharSequence>newLinkedList(), encoded.subSequence(idx, encodedLen), builder);
+      idx += doParseTrieToBuilder(Lists.<CharSequence>newLinkedList(), encoded, idx, builder);
     }
     return builder.build();
   }
@@ -48,16 +45,18 @@ static ImmutableMap<String, PublicSuffixType> parseTrie(CharSequence encoded) {
    * @param stack The prefixes that precede the characters represented by this node. Each entry of
    *     the stack is in reverse order.
    * @param encoded The serialized trie.
+   * @param start An index in the encoded serialized trie to begin reading characters from.
    * @param builder A map builder to which all entries will be added.
    * @return The number of characters consumed from {@code encoded}.
    */
   private static int doParseTrieToBuilder(
       List<CharSequence> stack,
       CharSequence encoded,
+      int start,
       ImmutableMap.Builder<String, PublicSuffixType> builder) {
 
     int encodedLen = encoded.length();
-    int idx = 0;
+    int idx = start;
     char c = '\0';
 
     // Read all of the characters for this node.
@@ -68,7 +67,7 @@ private static int doParseTrieToBuilder(
       }
     }
 
-    stack.add(0, reverse(encoded.subSequence(0, idx)));
+    stack.add(0, reverse(encoded.subSequence(start, idx)));
 
     if (c == '!' || c == '?' || c == ':' || c == ',') {
       // '!' represents an interior node that represents a REGISTRY entry in the map.
@@ -85,7 +84,7 @@ private static int doParseTrieToBuilder(
     if (c != '?' && c != ',') {
       while (idx < encodedLen) {
         // Read all the children
-        idx += doParseTrieToBuilder(stack, encoded.subSequence(idx, encodedLen), builder);
+        idx += doParseTrieToBuilder(stack, encoded, idx, builder);
         if (encoded.charAt(idx) == '?' || encoded.charAt(idx) == ',') {
           // An extra '?' or ',' after a child node indicates the end of all children of this node.
           idx++;
@@ -94,7 +93,7 @@ private static int doParseTrieToBuilder(
       }
     }
     stack.remove(0);
-    return idx;
+    return idx - start;
   }
 
   private static CharSequence reverse(CharSequence s) {