--- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPingGenerator.java
+++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPingGenerator.java
@@ -2,27 +2,28 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.telemetry;
 
 import android.content.Context;
 import android.os.Build;
-import java.io.IOException;
-import java.util.Locale;
 
 import com.keepsafe.switchboard.SwitchBoard;
-import org.json.JSONArray;
+
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.Locales;
 import org.mozilla.gecko.sync.ExtendedJSONObject;
 import org.mozilla.gecko.telemetry.TelemetryConstants.CorePing;
 import org.mozilla.gecko.util.StringUtils;
 
+import java.io.IOException;
+import java.util.Locale;
+
 /**
  * A class with static methods to generate the various Java-created Telemetry pings to upload to the telemetry server.
  */
 public class TelemetryPingGenerator {
 
     // In the server url, the initial path directly after the "scheme://host:port/"
     private static final String SERVER_INITIAL_PATH = "submit/telemetry";
 
@@ -81,20 +82,13 @@ public class TelemetryPingGenerator {
 
         ping.put(CorePing.ARCHITECTURE, AppConstants.ANDROID_CPU_ARCH);
         ping.put(CorePing.CLIENT_ID, clientId);
         ping.put(CorePing.DEVICE, deviceDescriptor);
         ping.put(CorePing.LOCALE, Locales.getLanguageTag(Locale.getDefault()));
         ping.put(CorePing.OS_VERSION, Integer.toString(Build.VERSION.SDK_INT)); // A String for cross-platform reasons.
         ping.put(CorePing.SEQ, seq);
         if (AppConstants.MOZ_SWITCHBOARD) {
-            ping.put(CorePing.EXPERIMENTS, getActiveExperiments(context));
+            ping.putArray(CorePing.EXPERIMENTS, SwitchBoard.getActiveExperiments(context));
         }
         return ping;
     }
-
-    private static JSONArray getActiveExperiments(final Context context) {
-        if (!AppConstants.MOZ_SWITCHBOARD) {
-            throw new IllegalStateException("This method should not be called with switchboard disabled");
-        }
-        return new JSONArray(SwitchBoard.getActiveExperiments(context));
-    }
 }

--- a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/ExtendedJSONObject.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/ExtendedJSONObject.java
@@ -295,16 +295,24 @@ public class ExtendedJSONObject {
   public void put(String key, ExtendedJSONObject value) {
     this.putRaw(key, value);
   }
 
   public void put(String key, JSONArray value) {
     this.putRaw(key, value);
   }
 
+  @SuppressWarnings("unchecked")
+  public void putArray(String key, List<String> value) {
+    // Frustratingly inefficient, but there you have it.
+    final JSONArray jsonArray = new JSONArray();
+    jsonArray.addAll(value);
+    this.putRaw(key, jsonArray);
+  }
+
   /**
    * Remove key-value pair from JSONObject.
    *
    * @param key
    *          to be removed.
    * @return true if key exists and was removed, false otherwise.
    */
   public boolean remove(String key) {