diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml
new file mode 100644
index 0000000000..4c01b595b7
--- /dev/null
+++ b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>device-mgt-mdm-android</artifactId>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.mgt.mobile.android.impl</artifactId>
+    <version>1.9.2-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>WSO2 Carbon - Mobile Device Management Android Impl</name>
+    <description>WSO2 Carbon - Mobile Device Management Android Implementation</description>
+    <url>http://wso2.org</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${carbon.mobile.device.mgt.version}</Bundle-Version>
+                        <Bundle-Description>Device Management Mobile Impl Bundle</Bundle-Description>
+                        <Private-Package>org.wso2.carbon.device.mgt.mobile.internal</Private-Package>
+                        <Import-Package>
+                            org.osgi.framework,
+                            org.osgi.service.component,
+                            org.apache.commons.logging,
+                            javax.xml.bind.*,
+                            javax.naming,
+                            javax.sql,
+                            javax.xml.bind.annotation.*,
+                            javax.xml.parsers,
+                            org.w3c.dom,
+                            org.wso2.carbon.core,
+                            org.wso2.carbon.context,
+                            org.wso2.carbon.utils.*,
+                            org.wso2.carbon.device.mgt.common.*,
+                            org.wso2.carbon.ndatasource.core,
+                            org.wso2.carbon.policy.mgt.common.*,
+                            org.wso2.carbon.policy.mgt.core.*,
+                            org.wso2.carbon.registry.core,
+                            org.wso2.carbon.registry.core.exceptions,
+                            org.wso2.carbon.registry.core.service,
+                            org.wso2.carbon.registry.core.session,
+                            org.wso2.carbon.registry.api,
+                            org.wso2.carbon.device.mgt.extensions.license.mgt.registry,
+                            com.google.gson.*
+                        </Import-Package>
+                        <Export-Package>
+                            !org.wso2.carbon.device.mgt.mobile.internal,
+                            !org.wso2.carbon.device.mgt.mobile.impl,
+                            org.wso2.carbon.device.mgt.mobile.*,
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-surefire-plugin</artifactId>-->
+                <!--<version>2.18</version>-->
+                <!--<configuration>-->
+                    <!--<systemPropertyVariables>-->
+                        <!--<log4j.configuration>file:src/test/resources/log4j.properties-->
+                        <!--</log4j.configuration>-->
+                    <!--</systemPropertyVariables>-->
+                    <!--<suiteXmlFiles>-->
+                        <!--<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
+                    <!--</suiteXmlFiles>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi.services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.registry.api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.registry.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.wso2</groupId>
+            <artifactId>jdbc-pool</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database.wso2</groupId>
+            <artifactId>h2-database-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/components/device-mgt-mdm-android/pom.xml b/components/device-mgt-mdm-android/pom.xml
new file mode 100644
index 0000000000..e98b70c751
--- /dev/null
+++ b/components/device-mgt-mdm-android/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>carbon-device-mgt-plugins-parent</artifactId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>device-mgt-mdm-android</artifactId>
+    <version>1.9.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Mobile Device Management Android Component</name>
+    <url>http://wso2.org</url>
+
+    <modules>
+        <module>org.wso2.carbon.device.mgt.mobile.android.impl</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-scr-plugin</artifactId>
+                    <version>1.7.2</version>
+                    <executions>
+                        <execution>
+                            <id>generate-scr-scrdescriptor</id>
+                            <goals>
+                                <goal>scr</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
new file mode 100644
index 0000000000..ea51c36c61
--- /dev/null
+++ b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>device-mgt-mdm-android-feature</artifactId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.mgt.mobile.android.feature</artifactId>
+    <packaging>pom</packaging>
+    <version>1.9.2-SNAPSHOT</version>
+    <name>WSO2 Carbon - Android Device Management</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the core bundles required for Android Device Management functionality
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.mobile.android.impl</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.device.mgt.mobile</id>
+                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.impl:${carbon.mobile.device.mgt.version}
+                                </bundleDef>
+                            </bundles>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}</importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/build.properties b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/build.properties
new file mode 100644
index 0000000000..9c86577d76
--- /dev/null
+++ b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
diff --git a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/conf/mobile-config.xml b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/conf/mobile-config.xml
new file mode 100644
index 0000000000..c4c5c8f0e7
--- /dev/null
+++ b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/conf/mobile-config.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
+
+<MobileDeviceMgtConfiguration>
+    <ManagementRepository>
+    <DataSourceConfigurations>
+        <DataSourceConfiguration type="android">
+            <JndiLookupDefinition>
+                <Name>jdbc/MobileAndroidDM_DS</Name>
+            </JndiLookupDefinition>
+        </DataSourceConfiguration>
+        <DataSourceConfiguration type="windows">
+            <JndiLookupDefinition>
+                <Name>jdbc/MobileWindowsDM_DS</Name>
+            </JndiLookupDefinition>
+        </DataSourceConfiguration>
+    </DataSourceConfigurations>
+    </ManagementRepository>
+    <APIPublisher>
+	<APIs>
+        <API>
+            <Name>appmanager</Name>
+            <Owner>admin</Owner>
+            <Context>/devices</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/test/app</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+        <API>
+            <Name>enrol</Name>
+            <Owner>admin</Owner>
+            <Context>/enroll</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/mdm-android-agent/enrollment</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+        <API>
+            <Name>license</Name>
+            <Owner>admin</Owner>
+            <Context>/license</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/mdm-android-agent/devices/license</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+        <API>
+            <Name>operation</Name>
+            <Owner>admin</Owner>
+            <Context>/operation</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/mdm-android-agent/operations</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+	</APIs>
+    </APIPublisher>
+</MobileDeviceMgtConfiguration>
diff --git a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/dbscripts/plugins/h2_android.sql b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/dbscripts/plugins/h2_android.sql
new file mode 100644
index 0000000000..c6ae33335a
--- /dev/null
+++ b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/dbscripts/plugins/h2_android.sql
@@ -0,0 +1,56 @@
+
+-- -----------------------------------------------------
+-- Table `AD_DEVICE`
+-- -----------------------------------------------------
+CREATE  TABLE IF NOT EXISTS `AD_DEVICE` (
+  `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
+  `GCM_TOKEN` VARCHAR(45) NULL DEFAULT NULL ,
+  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL ,
+  `IMEI` VARCHAR(45) NULL DEFAULT NULL ,
+  `IMSI` VARCHAR(45) NULL DEFAULT NULL ,
+  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,
+  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL ,
+  `VENDOR` VARCHAR(45) NULL DEFAULT NULL ,
+  `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
+  `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
+  `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
+  `MAC_ADDRESS` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (`ANDROID_DEVICE_ID`) );
+
+-- -----------------------------------------------------
+-- Table `AD_FEATURE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `AD_FEATURE` (
+  `ID` INT NOT NULL AUTO_INCREMENT ,
+  `CODE` VARCHAR(45) NOT NULL,
+  `NAME` VARCHAR(100) NULL ,
+  `DESCRIPTION` VARCHAR(200) NULL ,
+  PRIMARY KEY (`ID`) );
+
+
+-- -----------------------------------------------------
+-- TODO remove this later
+-- -----------------------------------------------------
+
+INSERT INTO AD_FEATURE (CODE, NAME, DESCRIPTION)
+VALUES
+('DEVICE_LOCK', 'Device Lock', 'Lock the device'),
+('DEVICE_LOCATION', 'Location', 'Request coordinates of device location'),
+('WIFI', 'Wifi', 'Setting up wifi configuration'),
+('CAMERA', 'Camera', 'Enable or disable camera'),
+('EMAIL', 'Email', 'Configure email settings'),
+('DEVICE_MUTE', 'Mute', 'Enable mute in the device'),
+('DEVICE_INFO', 'Device Info', 'Request device information'),
+('ENTERPRISE_WIPE', 'Enterprise Wipe', 'Remove enterprise applications'),
+('CLEAR_PASSWORD', 'Clear Password', 'Clear current password'),
+('WIPE_DATA', 'Wipe Data', 'Factory reset the device'),
+('APPLICATION_LIST', 'Application List', 'Request list of current installed applications'),
+('CHANGE_LOCK_CODE', 'Change Lock-code', 'Change current lock code'),
+('INSTALL_APPLICATION', 'Install App', 'Install Enterprise or Market application'),
+('UNINSTALL_APPLICATION', 'Uninstall App', 'Uninstall application'),
+('BLACKLIST_APPLICATIONS', 'Blacklist app', 'Blacklist applications'),
+('ENCRYPT_STORAGE', 'Encrypt storage', 'Encrypt storage'),
+('DEVICE_RING', 'Ring', 'Ring the device'),
+('PASSCODE_POLICY', 'Password Policy', 'Set passcode policy'),
+('NOTIFICATION', 'Message', 'Send message');
diff --git a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/dbscripts/plugins/mysql_android.sql b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/dbscripts/plugins/mysql_android.sql
new file mode 100644
index 0000000000..dff4740712
--- /dev/null
+++ b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/dbscripts/plugins/mysql_android.sql
@@ -0,0 +1,32 @@
+-- -----------------------------------------------------
+-- Table `MBL_DEVICE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `AD_DEVICE` (
+  `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
+  `DEVICE_INFO` VARCHAR(500) NULL DEFAULT NULL ,
+  `GCM_TOKEN` VARCHAR(45) NULL DEFAULT NULL ,
+  `IMEI` VARCHAR(45) NULL DEFAULT NULL ,
+  `IMSI` VARCHAR(45) NULL DEFAULT NULL ,
+  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,
+  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL ,
+  `VENDOR` VARCHAR(45) NULL DEFAULT NULL ,
+  `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
+  `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
+  `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
+  `MAC_ADDRESS` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (`ANDROID_DEVICE_ID`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `MBL_FEATURE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `AD_FEATURE` (
+  `ID` INT NOT NULL AUTO_INCREMENT ,
+  `CODE` VARCHAR(45) NOT NULL,
+  `NAME` VARCHAR(100) NULL ,
+  `DESCRIPTION` VARCHAR(200) NULL ,
+  PRIMARY KEY (`ID`))
+ENGINE = InnoDB;
+
diff --git a/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
new file mode 100644
index 0000000000..1ee5d1b681
--- /dev/null
+++ b/features/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/conf/mobile-config.xml,target:${installFolder}/../../conf/mobile-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/dbscripts/plugins/,target:${installFolder}/../../../dbscripts/cdm/plugins,overwrite:true);\
diff --git a/features/device-mgt-mdm-android/pom.xml b/features/device-mgt-mdm-android/pom.xml
new file mode 100644
index 0000000000..d1489be1e8
--- /dev/null
+++ b/features/device-mgt-mdm-android/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>carbon-device-mgt-plugins-parent</artifactId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>device-mgt-mdm-android-feature</artifactId>
+    <version>1.9.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Android Device Management Feature</name>
+    <url>http://wso2.org</url>
+
+    <modules>
+        <module>org.wso2.carbon.device.mgt.mobile.android.feature</module>
+    </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 8f140d877b..d674e616a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,9 @@
 
     <modules>
         <module>components/device-mgt</module>
+        <module>components/device-mgt-mdm-android</module>
         <module>features/device-mgt</module>
+        <module>features/device-mgt-mdm-android</module>
     </modules>
 
     <dependencyManagement>
@@ -254,6 +256,13 @@
                 <version>${carbon.mobile.device.mgt.version}</version>
             </dependency>
 
+            <!--Android dependencies-->
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.mobile.android.impl</artifactId>
+                <version>${carbon.mobile.device.mgt.version}</version>
+            </dependency>
+
             <!--Osgi dependencies-->
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>