diff --git a/mobile/android/base/FilePicker.java b/mobile/android/base/FilePicker.java
index 834b483880ae..d3cf40755354 100644
--- a/mobile/android/base/FilePicker.java
+++ b/mobile/android/base/FilePicker.java
@@ -199,7 +199,7 @@ public class FilePicker implements GeckoEventListener {
             title = getFilePickerTitle(mimeType);
         }
         Intent chooser = Intent.createChooser(base, title);
-        chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS, intents.toArray(new Parcelable[]{}));
+        chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS, intents.toArray(new Parcelable[intents.size()]));
         handler.gotIntent(chooser);
     }
 
diff --git a/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java b/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java
index 0295e4a19cc5..902945345ed9 100644
--- a/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java
+++ b/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java
@@ -379,7 +379,7 @@ abstract public class FxAccountAbstractSetupActivity extends FxAccountAbstractAc
     }
 
     // And then sorted in alphabetical order.
-    final String[] sortedEmails = emails.toArray(new String[0]);
+    final String[] sortedEmails = emails.toArray(new String[emails.size()]);
     Arrays.sort(sortedEmails);
 
     final ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_dropdown_item_1line, sortedEmails);
diff --git a/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java b/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
index 7d193c2890db..066f6e026c62 100644
--- a/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
+++ b/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
@@ -176,7 +176,7 @@ public class FxAccountCreateAccountActivity extends FxAccountAbstractSetupActivi
     for (int i = 1991; i <= year - 5; i++) {
       years.add(Integer.toString(i));
     }
-    return years.toArray(new String[0]);
+    return years.toArray(new String[years.size()]);
   }
 
   protected void createYearEdit() {
diff --git a/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java b/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java
index 438e7ef38063..9b8de1336e87 100644
--- a/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java
@@ -173,7 +173,7 @@ public class FormHistoryRepositorySession extends
           }
         }
 
-        String guidsArray[] = guids.toArray(new String[0]);
+        String guidsArray[] = guids.toArray(new String[guids.size()]);
         delegate.onGuidsSinceSucceeded(guidsArray);
       }
     };
@@ -466,7 +466,7 @@ public class FormHistoryRepositorySession extends
   protected void flushInsertQueue() throws RemoteException {
     synchronized (recordsBufferMonitor) {
       if (recordsBuffer.size() > 0) {
-        final ContentValues[] outgoing = recordsBuffer.toArray(new ContentValues[0]);
+        final ContentValues[] outgoing = recordsBuffer.toArray(new ContentValues[recordsBuffer.size()]);
         recordsBuffer = new ArrayList<ContentValues>();
 
         if (outgoing == null || outgoing.length == 0) {