diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentAllocateAction.java b/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentAllocateAction.java
index fc7a33a3ee4..6273c4c7b71 100644
--- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentAllocateAction.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentAllocateAction.java
@@ -21,10 +21,10 @@ package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
-import com.google.api.client.util.Lists;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 import com.google.common.primitives.Longs;
 import com.metamx.common.Granularity;
 import com.metamx.common.IAE;
diff --git a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java b/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java
index daf8d0d86d0..4cf77449c3b 100644
--- a/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import io.druid.common.utils.JodaUtils;
 import io.druid.indexing.common.task.Task;
diff --git a/server/src/main/java/io/druid/client/ImmutableSegmentLoadInfo.java b/server/src/main/java/io/druid/client/ImmutableSegmentLoadInfo.java
index 0eebd6766c7..38c93611dfa 100644
--- a/server/src/main/java/io/druid/client/ImmutableSegmentLoadInfo.java
+++ b/server/src/main/java/io/druid/client/ImmutableSegmentLoadInfo.java
@@ -21,9 +21,8 @@ package io.druid.client;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
 import io.druid.server.coordination.DruidServerMetadata;
 import io.druid.timeline.DataSegment;
 
diff --git a/server/src/main/java/io/druid/client/SegmentLoadInfo.java b/server/src/main/java/io/druid/client/SegmentLoadInfo.java
index 6dac43733d9..8053152e7d7 100644
--- a/server/src/main/java/io/druid/client/SegmentLoadInfo.java
+++ b/server/src/main/java/io/druid/client/SegmentLoadInfo.java
@@ -19,14 +19,11 @@
 
 package io.druid.client;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
 import io.druid.server.coordination.DruidServerMetadata;
 import io.druid.timeline.DataSegment;
 
-import java.util.List;
 import java.util.Set;
 
 public class SegmentLoadInfo
diff --git a/server/src/test/java/io/druid/server/initialization/JettyQosTest.java b/server/src/test/java/io/druid/server/initialization/JettyQosTest.java
index 7be916fe56b..1b37f48cca8 100644
--- a/server/src/test/java/io/druid/server/initialization/JettyQosTest.java
+++ b/server/src/test/java/io/druid/server/initialization/JettyQosTest.java
@@ -20,7 +20,7 @@
 package io.druid.server.initialization;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListenableFuture;
diff --git a/services/src/test/java/io/druid/cli/PullDependenciesTest.java b/services/src/test/java/io/druid/cli/PullDependenciesTest.java
index 1257b93b0d8..891fca4d1b6 100644
--- a/services/src/test/java/io/druid/cli/PullDependenciesTest.java
+++ b/services/src/test/java/io/druid/cli/PullDependenciesTest.java
@@ -19,7 +19,7 @@
 
 package io.druid.cli;
 
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.metamx.common.ISE;