diff --git a/product/modules/agents/android/jax-rs/pom.xml b/product/modules/agents/android/jax-rs/pom.xml
index 59dc9a1bf65..306d7c24dcf 100644
--- a/product/modules/agents/android/jax-rs/pom.xml
+++ b/product/modules/agents/android/jax-rs/pom.xml
@@ -160,6 +160,10 @@
                 <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
                 <version>2.0.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.logging</artifactId>
+            </dependency>
         </dependencies>
     <properties>
         <cxf.version>2.6.1</cxf.version>
diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java
index 57dfcb2cc0d..141b76f0e1e 100644
--- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java
+++ b/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java
@@ -21,9 +21,9 @@ import com.google.gson.JsonObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
 
 import javax.ws.rs.*;