diff --git a/android/guava/src/com/google/common/base/Joiner.java b/android/guava/src/com/google/common/base/Joiner.java
index 0a2241620c43..7c39064937d7 100644
--- a/android/guava/src/com/google/common/base/Joiner.java
+++ b/android/guava/src/com/google/common/base/Joiner.java
@@ -104,10 +104,10 @@ public <A extends Appendable> A appendTo(A appendable, Iterable<?> parts) throws
   public <A extends Appendable> A appendTo(A appendable, Iterator<?> parts) throws IOException {
     checkNotNull(appendable);
     if (parts.hasNext()) {
-      appendable.append(toString(parts.next()));
+      appendable.append(toCharSequence(parts.next()));
       while (parts.hasNext()) {
         appendable.append(separator);
-        appendable.append(toString(parts.next()));
+        appendable.append(toCharSequence(parts.next()));
       }
     }
     return appendable;
@@ -241,8 +241,8 @@ public Joiner useForNull(String nullText) {
     checkNotNull(nullText);
     return new Joiner(this) {
       @Override
-      CharSequence toString(@Nullable Object part) {
-        return (part == null) ? nullText : Joiner.this.toString(part);
+      CharSequence toCharSequence(@Nullable Object part) {
+        return (part == null) ? nullText : Joiner.this.toCharSequence(part);
       }
 
       @Override
@@ -276,7 +276,7 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<?> parts) throws
         while (parts.hasNext()) {
           Object part = parts.next();
           if (part != null) {
-            appendable.append(Joiner.this.toString(part));
+            appendable.append(Joiner.this.toCharSequence(part));
             break;
           }
         }
@@ -284,7 +284,7 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<?> parts) throws
           Object part = parts.next();
           if (part != null) {
             appendable.append(separator);
-            appendable.append(Joiner.this.toString(part));
+            appendable.append(Joiner.this.toCharSequence(part));
           }
         }
         return appendable;
@@ -390,15 +390,15 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<
       checkNotNull(appendable);
       if (parts.hasNext()) {
         Entry<?, ?> entry = parts.next();
-        appendable.append(joiner.toString(entry.getKey()));
+        appendable.append(joiner.toCharSequence(entry.getKey()));
         appendable.append(keyValueSeparator);
-        appendable.append(joiner.toString(entry.getValue()));
+        appendable.append(joiner.toCharSequence(entry.getValue()));
         while (parts.hasNext()) {
           appendable.append(joiner.separator);
           Entry<?, ?> e = parts.next();
-          appendable.append(joiner.toString(e.getKey()));
+          appendable.append(joiner.toCharSequence(e.getKey()));
           appendable.append(keyValueSeparator);
-          appendable.append(joiner.toString(e.getValue()));
+          appendable.append(joiner.toCharSequence(e.getValue()));
         }
       }
       return appendable;
@@ -470,8 +470,7 @@ public MapJoiner useForNull(String nullText) {
     }
   }
 
-  // TODO(cpovirk): Rename to "toCharSequence."
-  CharSequence toString(@Nullable Object part) {
+  CharSequence toCharSequence(@Nullable Object part) {
     /*
      * requireNonNull is not safe: Joiner.on(...).join(somethingThatContainsNull) will indeed throw.
      * However, Joiner.on(...).useForNull(...).join(somethingThatContainsNull) *is* safe -- because
diff --git a/guava/src/com/google/common/base/Joiner.java b/guava/src/com/google/common/base/Joiner.java
index 24e24df5423b..fd1c34f6d52d 100644
--- a/guava/src/com/google/common/base/Joiner.java
+++ b/guava/src/com/google/common/base/Joiner.java
@@ -104,10 +104,10 @@ public <A extends Appendable> A appendTo(A appendable, Iterable<?> parts) throws
   public <A extends Appendable> A appendTo(A appendable, Iterator<?> parts) throws IOException {
     checkNotNull(appendable);
     if (parts.hasNext()) {
-      appendable.append(toString(parts.next()));
+      appendable.append(toCharSequence(parts.next()));
       while (parts.hasNext()) {
         appendable.append(separator);
-        appendable.append(toString(parts.next()));
+        appendable.append(toCharSequence(parts.next()));
       }
     }
     return appendable;
@@ -221,7 +221,7 @@ public String join(Iterable<?> parts) {
            */
           toJoin = Arrays.copyOf(toJoin, expandedCapacity(toJoin.length, toJoin.length + 1));
         }
-        toJoin[i++] = toString(part);
+        toJoin[i++] = toCharSequence(part);
       }
       // We might not have seen the expected number of elements, as discussed above.
       if (i != toJoin.length) {
@@ -277,8 +277,8 @@ public Joiner useForNull(String nullText) {
     checkNotNull(nullText);
     return new Joiner(this) {
       @Override
-      CharSequence toString(@Nullable Object part) {
-        return (part == null) ? nullText : Joiner.this.toString(part);
+      CharSequence toCharSequence(@Nullable Object part) {
+        return (part == null) ? nullText : Joiner.this.toCharSequence(part);
       }
 
       @Override
@@ -312,7 +312,7 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<?> parts) throws
         while (parts.hasNext()) {
           Object part = parts.next();
           if (part != null) {
-            appendable.append(Joiner.this.toString(part));
+            appendable.append(Joiner.this.toCharSequence(part));
             break;
           }
         }
@@ -320,7 +320,7 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<?> parts) throws
           Object part = parts.next();
           if (part != null) {
             appendable.append(separator);
-            appendable.append(Joiner.this.toString(part));
+            appendable.append(Joiner.this.toCharSequence(part));
           }
         }
         return appendable;
@@ -426,15 +426,15 @@ public <A extends Appendable> A appendTo(A appendable, Iterator<? extends Entry<
       checkNotNull(appendable);
       if (parts.hasNext()) {
         Entry<?, ?> entry = parts.next();
-        appendable.append(joiner.toString(entry.getKey()));
+        appendable.append(joiner.toCharSequence(entry.getKey()));
         appendable.append(keyValueSeparator);
-        appendable.append(joiner.toString(entry.getValue()));
+        appendable.append(joiner.toCharSequence(entry.getValue()));
         while (parts.hasNext()) {
           appendable.append(joiner.separator);
           Entry<?, ?> e = parts.next();
-          appendable.append(joiner.toString(e.getKey()));
+          appendable.append(joiner.toCharSequence(e.getKey()));
           appendable.append(keyValueSeparator);
-          appendable.append(joiner.toString(e.getValue()));
+          appendable.append(joiner.toCharSequence(e.getValue()));
         }
       }
       return appendable;
@@ -506,8 +506,7 @@ public MapJoiner useForNull(String nullText) {
     }
   }
 
-  // TODO(cpovirk): Rename to "toCharSequence."
-  CharSequence toString(@Nullable Object part) {
+  CharSequence toCharSequence(@Nullable Object part) {
     /*
      * requireNonNull is not safe: Joiner.on(...).join(somethingThatContainsNull) will indeed throw.
      * However, Joiner.on(...).useForNull(...).join(somethingThatContainsNull) *is* safe -- because