diff --git a/java/google/registry/tools/CreateLrpTokensCommand.java b/java/google/registry/tools/CreateLrpTokensCommand.java
index 7a530e2a6..61802a31a 100644
--- a/java/google/registry/tools/CreateLrpTokensCommand.java
+++ b/java/google/registry/tools/CreateLrpTokensCommand.java
@@ -24,6 +24,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
+import com.google.common.base.CharMatcher;
 import com.google.common.base.Function;
 import com.google.common.base.Splitter;
 import com.google.common.collect.FluentIterable;
@@ -96,6 +97,11 @@ public final class CreateLrpTokensCommand implements RemoteApiCommand {
   @Inject StringGenerator stringGenerator;
 
   private static final int BATCH_SIZE = 20;
+  
+  // Ensures that all of the double quotes to the right of a comma are balanced. In a well-formed
+  // CSV line, there can be no leading double quote preceding the comma.
+  private static final String COMMA_EXCEPT_WHEN_QUOTED_REGEX =
+      ",(?=([^\\\"]*\\\"[^\\\"]*\\\")*[^\\\"]*$)";
 
   @Override
   public void run() throws Exception {
@@ -124,7 +130,12 @@ public final class CreateLrpTokensCommand implements RemoteApiCommand {
       for (String token : generateTokens(BATCH_SIZE)) {
         line = reader.readLine();
         if (!isNullOrEmpty(line)) {
-          ImmutableList<String> values = ImmutableList.copyOf(Splitter.on(',').split(line));
+          ImmutableList<String> values =
+              ImmutableList.copyOf(
+                  Splitter.onPattern(COMMA_EXCEPT_WHEN_QUOTED_REGEX)
+                      // Results should not be surrounded in double quotes.
+                      .trimResults(CharMatcher.is('\"'))
+                      .split(line));
           LrpTokenEntity.Builder tokenBuilder = new LrpTokenEntity.Builder()
               .setAssignee(values.get(0))
               .setToken(token)
diff --git a/javatests/google/registry/tools/CreateLrpTokensCommandTest.java b/javatests/google/registry/tools/CreateLrpTokensCommandTest.java
index 64d16a066..84c2af85b 100644
--- a/javatests/google/registry/tools/CreateLrpTokensCommandTest.java
+++ b/javatests/google/registry/tools/CreateLrpTokensCommandTest.java
@@ -109,6 +109,34 @@ public class CreateLrpTokensCommandTest extends CommandTestCase<CreateLrpTokensC
     assertInStdout("domain.tld,LRP_abcdefghijklmnop");
   }
 
+  @Test
+  public void testSuccess_oneAssignee_byFile_withMetadata_quotedString() throws Exception {
+    Files.write("domain.tld,\"foo,foo\",bar", assigneeFile, UTF_8);
+    runCommand("--input=" + assigneeFilePath, "--tlds=tld", "--metadata_columns=key=1,key2=2");
+    assertLrpTokens(
+        createToken(
+            "LRP_abcdefghijklmnop",
+            "domain.tld",
+            ImmutableSet.of("tld"),
+            null,
+            ImmutableMap.of("key", "foo,foo", "key2", "bar")));
+    assertInStdout("domain.tld,LRP_abcdefghijklmnop");
+  }
+
+  @Test
+  public void testSuccess_oneAssignee_byFile_withMetadata_twoQuotedStrings() throws Exception {
+    Files.write("domain.tld,\"foo,foo\",\"bar,bar\"", assigneeFile, UTF_8);
+    runCommand("--input=" + assigneeFilePath, "--tlds=tld", "--metadata_columns=key=1,key2=2");
+    assertLrpTokens(
+        createToken(
+            "LRP_abcdefghijklmnop",
+            "domain.tld",
+            ImmutableSet.of("tld"),
+            null,
+            ImmutableMap.of("key", "foo,foo", "key2", "bar,bar")));
+    assertInStdout("domain.tld,LRP_abcdefghijklmnop");
+  }
+
   @Test
   public void testSuccess_emptyFile() throws Exception {
     Files.write("", assigneeFile, UTF_8);
@@ -235,6 +263,7 @@ public class CreateLrpTokensCommandTest extends CommandTestCase<CreateLrpTokensC
       assertThat(match.getValidTlds()).containsExactlyElementsIn(expectedToken.getValidTlds());
       assertThat(match.getRedemptionHistoryEntry())
           .isEqualTo(expectedToken.getRedemptionHistoryEntry());
+      assertThat(match.getMetadata()).containsExactlyEntriesIn(expectedToken.getMetadata());
     }
   }