Merge "Fix gamecore.zip"
diff --git a/hostside/src/com/android/game/qualification/test/PerformanceTest.java b/hostside/src/com/android/game/qualification/test/PerformanceTest.java
index 96dc61d..0c94c93 100644
--- a/hostside/src/com/android/game/qualification/test/PerformanceTest.java
+++ b/hostside/src/com/android/game/qualification/test/PerformanceTest.java
@@ -59,8 +59,8 @@
  */
 public class PerformanceTest {
     private static final String AJUR_RUNNER = "android.support.test.runner.AndroidJUnitRunner";
-    private static final long DEFAULT_TEST_TIMEOUT_MS = 10 * 60 * 1000L; //10min
-    private static final long DEFAULT_MAX_TIMEOUT_TO_OUTPUT_MS = 10 * 60 * 1000L; //10min
+    private static final long DEFAULT_TEST_TIMEOUT_MS = 30 * 60 * 1000L; //30min
+    private static final long DEFAULT_MAX_TIMEOUT_TO_OUTPUT_MS = 30 * 60 * 1000L; //30min
 
     private ApkInfo mApk;
     private String mApkDir;