Merge remote branch 'autotest-upstream/master' into autotest-merge

frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java

Index: frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java
diff --git a/frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java b/frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java
index 32cb3e5f14a3c6981effd1a834f6e2e8acf5f713..8e9b42814f5b08b1a059cf73e708e16ae745f0a1 100644
--- a/frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java
+++ b/frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java
@@ -157,8 +157,11 @@ public class CreateJobViewPresenter implements TestSelectorListener {
         if (display.getHostless().getValue()) {
             hostSelector.setEnabled(false);
         }
-        if (cloneObject.get("drone_set").isNull() == null) {
-            display.getDroneSet().selectByName(Utils.jsonToString(cloneObject.get("drone_set")));
+
+        if (staticData.getData("drone_sets_enabled").isBoolean().booleanValue()) {
+            if (cloneObject.get("drone_set").isNull() == null) {
+                display.getDroneSet().selectByName(Utils.jsonToString(cloneObject.get("drone_set")));
+            }
         }
 
         controlTypeSelect.setControlType(