diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
index 70c0fa3c9..83f971d3f 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
@@ -48,6 +48,6 @@ class Constants {
     static final String OS_TARGET = "os.target";
     // WSO2 AVD specific variables
     static final String WSO2_AVD_NAME = "ENTGRA_AVD";
-    static final String APK_LOCATION = File.separator + "resources" + File.separator + "android-agent.apk";
+    static final String APK_LOCATION = File.separator + "resources" + File.separator + "client-debug.apk";
     static final String WSO2_CONFIG_LOCATION = File.separator + "resources" + File.separator + "config.ini";
 }
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
index 22eef8791..31d60e46b 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/TryIt.java
@@ -276,7 +276,7 @@ public class TryIt {
             }
         }
         System.out.println("+----------------------------------------------------------------+");
-        System.out.println("|                        Entgra Android TryIt                      |");
+        System.out.println("|                        Entgra Android TryIt                    |");
         System.out.println("+----------------------------------------------------------------+");
 
         emulatorLocation = androidSdkHome + File.separator + "tools" + File.separator + "emulator";
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml
index 86d898df4..a7c8ca4ff 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml
@@ -28,9 +28,6 @@
     </target>
     <target name="zip" depends="clean">
         <zip destfile="${target-dir}/android-tryit.ZIP" update="true" duplicate="preserve">
-            <zipfileset
-                    dir="src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/"
-                    includes="android-agent.apk" fullpath="resources/android-agent.apk"/>
             <zipfileset
                     dir="target/"
                     includes="JavaApp.jar" fullpath="JavaApp.jar"/>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/resources/client-debug.apk b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/resources/client-debug.apk
new file mode 100644
index 000000000..46d45da13
Binary files /dev/null and b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/resources/client-debug.apk differ
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk
index 947133d6e..91c775a77 100644
Binary files a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk and b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk differ