diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java
index ec4f8e8a735..5c61072882e 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/FileStore.java
@@ -53,7 +53,9 @@
  */
 public class FileStore {
   private static final String CRASHLYTICS_PATH_V1 = ".com.google.firebase.crashlytics.files.v1";
-  private static final String CRASHLYTICS_PATH_V2 = ".com.google.firebase.crashlytics.files.v2";
+  // Android has a maximum length for folder sizes. If this string is too long,
+  // the folder can end up too long because we append the app process name to it
+  private static final String CRASHLYTICS_PATH_V2 = ".crashlytics.v2";
   private static final String SESSIONS_PATH = "open-sessions";
   private static final String NATIVE_SESSION_SUBDIR = "native";
   private static final String REPORTS_PATH = "reports";