diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java
index 0b3c01e23e1..cad72586703 100644
--- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java
+++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CommonUtils.java
@@ -52,7 +52,8 @@
 public class CommonUtils {
 
   private static final String SHA1_INSTANCE = "SHA-1";
-  private static final String GOOGLE_SDK = "google_sdk";
+  private static final String GOLDFISH = "goldfish";
+  private static final String RANCHU = "ranchu";
   private static final String SDK = "sdk";
 
   public static final String SHARED_PREFS_NAME = "com.google.firebase.crashlytics";
@@ -403,7 +404,10 @@ public static int getResourcesIdentifier(Context context, String key, String res
    */
   public static boolean isEmulator(Context context) {
     final String androidId = Secure.getString(context.getContentResolver(), Secure.ANDROID_ID);
-    return SDK.equals(Build.PRODUCT) || GOOGLE_SDK.equals(Build.PRODUCT) || androidId == null;
+    return Build.PRODUCT.contains(SDK)
+        || Build.HARDWARE.contains(GOLDFISH)
+        || Build.HARDWARE.contains(RANCHU)
+        || androidId == null;
   }
 
   public static boolean isRooted(Context context) {