diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/.gitignore b/components/iot-plugins/androidsense-plugin/CatsAge/.gitignore
new file mode 100644
index 000000000..c6cbe562a
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/.gitignore b/components/iot-plugins/androidsense-plugin/CatsAge/app/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/build.gradle b/components/iot-plugins/androidsense-plugin/CatsAge/app/build.gradle
new file mode 100644
index 000000000..dac38ae46
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        applicationId "com.wso2.catsage"
+        minSdkVersion 15
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+}
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/proguard-rules.pro b/components/iot-plugins/androidsense-plugin/CatsAge/app/proguard-rules.pro
new file mode 100644
index 000000000..2da8c6b1f
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/dilan/Software/SDKs/Android/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/androidTest/java/com/wso2/catsage/ApplicationTest.java b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/androidTest/java/com/wso2/catsage/ApplicationTest.java
new file mode 100644
index 000000000..c6a21cfc3
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/androidTest/java/com/wso2/catsage/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.wso2.catsage;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/AndroidManifest.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..04977946b
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.wso2.catsage">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <activity android:name=".HomeActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".SecondActivity"></activity>
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/java/com/wso2/catsage/HomeActivity.java b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/java/com/wso2/catsage/HomeActivity.java
new file mode 100644
index 000000000..1a5f36e49
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/java/com/wso2/catsage/HomeActivity.java
@@ -0,0 +1,50 @@
+package com.wso2.catsage;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+public class HomeActivity extends AppCompatActivity {
+
+    EditText editTextAge;
+    Button buttonCalculateAge;
+    TextView textViewCatsAge;
+    Button buttonSecondActivity;
+
+    int catAge;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_home);
+
+        textViewCatsAge = (TextView) findViewById(R.id.textViewCatsAge);
+        buttonCalculateAge = (Button) findViewById(R.id.buttonCalculateAge);
+        editTextAge = (EditText) findViewById(R.id.editTextAge);
+        buttonSecondActivity =(Button) findViewById(R.id.buttonSecond);
+
+        buttonCalculateAge.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                int age = Integer.valueOf(editTextAge.getText().toString());
+                catAge = age * 7;
+                textViewCatsAge.setText("Cat's Age : " + catAge);
+            }
+        });
+
+        buttonSecondActivity.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(HomeActivity.this, SecondActivity.class);
+                intent.putExtra("catAge", catAge);
+                startActivity(intent);
+            }
+        });
+
+
+    }
+}
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/java/com/wso2/catsage/SecondActivity.java b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/java/com/wso2/catsage/SecondActivity.java
new file mode 100644
index 000000000..9dd32f27f
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/java/com/wso2/catsage/SecondActivity.java
@@ -0,0 +1,25 @@
+package com.wso2.catsage;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import org.w3c.dom.Text;
+
+public class SecondActivity extends AppCompatActivity {
+
+    TextView textViewSecondCatAge;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_second);
+
+        textViewSecondCatAge = (TextView) findViewById(R.id.textViewSecondCatAge);
+
+        int catAge = getIntent().getExtras().getInt("catAge");
+
+        textViewSecondCatAge.setText(String.valueOf(catAge));
+
+    }
+}
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/drawable/cat.jpg b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/drawable/cat.jpg
new file mode 100644
index 000000000..e201b4545
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/drawable/cat.jpg differ
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/layout/activity_home.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/layout/activity_home.xml
new file mode 100644
index 000000000..881a944f0
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/layout/activity_home.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:orientation="vertical"
+    tools:context="com.wso2.catsage.HomeActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Enter Age:"
+        android:id="@+id/textView"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true" />
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/editTextAge"
+        android:layout_marginTop="34dp"
+        android:layout_below="@+id/textView"
+        android:layout_centerHorizontal="true" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Calculate Cat's Age"
+        android:id="@+id/buttonCalculateAge"
+        android:layout_below="@+id/editTextAge"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="25dp" />
+
+    <TextView
+        android:layout_marginTop="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Cat&apos;s Age :"
+        android:id="@+id/textViewCatsAge"
+        android:layout_alignTop="@+id/editTextAge"
+        android:layout_alignLeft="@+id/textView"
+        android:layout_alignStart="@+id/textView" />
+
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Second Activity"
+        android:id="@+id/buttonSecond" />
+
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/imageView"
+            android:src="@drawable/cat"
+            android:layout_below="@+id/textView2"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="44dp" />
+
+
+</LinearLayout>
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/layout/activity_second.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/layout/activity_second.xml
new file mode 100644
index 000000000..7ff031367
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/layout/activity_second.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.wso2.catsage.SecondActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Large Text"
+        android:id="@+id/textViewSecondCatAge"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true" />
+</RelativeLayout>
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-hdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..cde69bccc
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-mdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c133a0cbd
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..bfa42f0e7
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..324e72cdd
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..aee44e138
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values-w820dp/dimens.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/colors.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/colors.xml
new file mode 100644
index 000000000..3ab3e9cbc
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/dimens.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..47c822467
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/strings.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..1a82364a7
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Cats Age</string>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/styles.xml b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..5885930df
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/app/src/test/java/com/wso2/catsage/ExampleUnitTest.java b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/test/java/com/wso2/catsage/ExampleUnitTest.java
new file mode 100644
index 000000000..238b3de95
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/app/src/test/java/com/wso2/catsage/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.wso2.catsage;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/build.gradle b/components/iot-plugins/androidsense-plugin/CatsAge/build.gradle
new file mode 100644
index 000000000..03bced9f3
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/gradle.properties b/components/iot-plugins/androidsense-plugin/CatsAge/gradle.properties
new file mode 100644
index 000000000..1d3591c8a
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/gradle/wrapper/gradle-wrapper.properties b/components/iot-plugins/androidsense-plugin/CatsAge/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..122a0dca2
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/gradlew b/components/iot-plugins/androidsense-plugin/CatsAge/gradlew
new file mode 100755
index 000000000..9d82f7891
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/gradlew.bat b/components/iot-plugins/androidsense-plugin/CatsAge/gradlew.bat
new file mode 100644
index 000000000..aec99730b
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/components/iot-plugins/androidsense-plugin/CatsAge/settings.gradle b/components/iot-plugins/androidsense-plugin/CatsAge/settings.gradle
new file mode 100644
index 000000000..e7b4def49
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/CatsAge/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/.gitignore b/components/iot-plugins/androidsense-plugin/MyApplication/.gitignore
new file mode 100644
index 000000000..c6cbe562a
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/.gitignore b/components/iot-plugins/androidsense-plugin/MyApplication/app/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/build.gradle b/components/iot-plugins/androidsense-plugin/MyApplication/app/build.gradle
new file mode 100644
index 000000000..d3b6e4f8a
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        applicationId "com.wso2.myapplication"
+        minSdkVersion 15
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    androidTestCompile 'com.android.support:support-annotations:23.4.0'
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test:rules:0.5'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+
+
+}
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/proguard-rules.pro b/components/iot-plugins/androidsense-plugin/MyApplication/app/proguard-rules.pro
new file mode 100644
index 000000000..2da8c6b1f
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/dilan/Software/SDKs/Android/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/androidTest/java/com/wso2/myapplication/ApplicationTest.java b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/androidTest/java/com/wso2/myapplication/ApplicationTest.java
new file mode 100644
index 000000000..902fdbb7f
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/androidTest/java/com/wso2/myapplication/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.wso2.myapplication;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/androidTest/java/com/wso2/myapplication/MainActivityTest.java b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/androidTest/java/com/wso2/myapplication/MainActivityTest.java
new file mode 100644
index 000000000..13355fc93
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/androidTest/java/com/wso2/myapplication/MainActivityTest.java
@@ -0,0 +1,54 @@
+/*
+ *
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed 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.
+ */
+
+package com.wso2.myapplication;
+
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static android.support.test.espresso.action.ViewActions.typeText;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+@RunWith(AndroidJUnit4.class)
+public class MainActivityTest {
+
+    @Rule
+    public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class);
+
+
+    @Test
+    public void testHi() {
+
+        onView(withId(R.id.editTextInput))
+                .perform(typeText("Dilan"), closeSoftKeyboard());
+
+        onView(withId(R.id.buttonSayHello)).perform(click());
+
+        onView(withId(R.id.textViewHello))
+                .check(matches(withText("Hi Dilan!")));
+    }
+
+}
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/AndroidManifest.xml b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..794c8b75c
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.wso2.myapplication">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/java/com/wso2/myapplication/Calculator.java b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/java/com/wso2/myapplication/Calculator.java
new file mode 100644
index 000000000..8f80c22d5
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/java/com/wso2/myapplication/Calculator.java
@@ -0,0 +1,29 @@
+/*
+ *
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed 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.
+ */
+
+package com.wso2.myapplication;
+
+public class Calculator {
+
+    public float add(float x, float y){
+        return x + y;
+    }
+
+    public int square(int value){
+        return value * value;
+    }
+}
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/java/com/wso2/myapplication/MainActivity.java b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/java/com/wso2/myapplication/MainActivity.java
new file mode 100644
index 000000000..5f739f3e5
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/java/com/wso2/myapplication/MainActivity.java
@@ -0,0 +1,37 @@
+package com.wso2.myapplication;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+public class MainActivity extends AppCompatActivity {
+
+
+    EditText editTextInput;
+    Button buttonSayHello;
+    TextView textViewHello;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Calculator calculator = new Calculator();
+
+        editTextInput = (EditText) findViewById(R.id.editTextInput);
+        buttonSayHello = (Button) findViewById(R.id.buttonSayHello);
+        textViewHello = (TextView) findViewById(R.id.textViewHello);
+
+        buttonSayHello.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String input = editTextInput.getText().toString();
+                textViewHello.setText("Hi " + input + "!");
+            }
+        });
+
+    }
+}
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/layout/activity_main.xml b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..56c187c19
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.wso2.myapplication.MainActivity">
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/editTextInput"
+        android:layout_gravity="center_horizontal" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Say Hello!"
+        android:id="@+id/buttonSayHello"
+        android:layout_gravity="center_horizontal" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Large Text"
+        android:id="@+id/textViewHello"
+        android:layout_gravity="center_horizontal" />
+</LinearLayout>
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..cde69bccc
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c133a0cbd
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..bfa42f0e7
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..324e72cdd
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..aee44e138
Binary files /dev/null and b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values-w820dp/dimens.xml b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/colors.xml b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/colors.xml
new file mode 100644
index 000000000..3ab3e9cbc
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/dimens.xml b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..47c822467
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/strings.xml b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..830dc7836
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">MyApplication</string>
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/styles.xml b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..5885930df
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/test/java/com/wso2/myapplication/CalculatorTest.java b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/test/java/com/wso2/myapplication/CalculatorTest.java
new file mode 100644
index 000000000..b2ca798f2
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/test/java/com/wso2/myapplication/CalculatorTest.java
@@ -0,0 +1,34 @@
+package com.wso2.myapplication;
+
+import junit.framework.TestCase;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by dilan on 7/22/16.
+ */
+public class CalculatorTest extends TestCase {
+
+
+    Calculator calculator;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        calculator = new Calculator();
+    }
+
+    @Test
+    public void testAdd() throws Exception {
+        assertEquals(calculator.add(10f, 20f), 30f, 0);
+        assertEquals(calculator.add(30f, 20f), 50f, 0);
+    }
+
+    @Test
+    public void testSquare() throws Exception {
+        assertEquals(calculator.square(6), 36);
+    }
+}
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/app/src/test/java/com/wso2/myapplication/ExampleUnitTest.java b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/test/java/com/wso2/myapplication/ExampleUnitTest.java
new file mode 100644
index 000000000..cb573232a
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/app/src/test/java/com/wso2/myapplication/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.wso2.myapplication;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/build.gradle b/components/iot-plugins/androidsense-plugin/MyApplication/build.gradle
new file mode 100644
index 000000000..03bced9f3
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/gradle.properties b/components/iot-plugins/androidsense-plugin/MyApplication/gradle.properties
new file mode 100644
index 000000000..1d3591c8a
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/gradle/wrapper/gradle-wrapper.properties b/components/iot-plugins/androidsense-plugin/MyApplication/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..122a0dca2
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/gradlew b/components/iot-plugins/androidsense-plugin/MyApplication/gradlew
new file mode 100755
index 000000000..9d82f7891
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/gradlew.bat b/components/iot-plugins/androidsense-plugin/MyApplication/gradlew.bat
new file mode 100644
index 000000000..aec99730b
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/components/iot-plugins/androidsense-plugin/MyApplication/settings.gradle b/components/iot-plugins/androidsense-plugin/MyApplication/settings.gradle
new file mode 100644
index 000000000..e7b4def49
--- /dev/null
+++ b/components/iot-plugins/androidsense-plugin/MyApplication/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
index 89fc4481a..323da65c0 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
@@ -129,8 +129,14 @@ public class AndroidAPIUtils {
         DeviceIDHolder deviceIDHolder = deviceUtils.validateDeviceIdentifiers(deviceIDs);
 
         List<DeviceIdentifier> validDeviceIds = deviceIDHolder.getValidDeviceIDList();
-        Activity activity = getDeviceManagementService().addOperation(
-                DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, operation, validDeviceIds);
+        Activity activity = null;
+        if(validDeviceIds.size() > 0) {
+            activity = getDeviceManagementService().addOperation(
+                    DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, operation, validDeviceIds);
+        } else {
+            throw new IllegalArgumentException("Invalid device Identifiers found");
+        }
+
 //        if (activity != null) {
 //            GCMService gcmService = getGCMService();
 //            if (gcmService.isGCMEnabled()) {
@@ -142,11 +148,7 @@ public class AndroidAPIUtils {
 //                getGCMService().sendNotification(operation.getCode(), devices);
 //            }
 //        }
-        if (!deviceIDHolder.getErrorDeviceIdList().isEmpty()) {
-            throw new BadRequestException(
-                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(deviceUtils.
-                            convertErrorMapIntoErrorMessage(deviceIDHolder.getErrorDeviceIdList())).build());
-        }
+
         return Response.status(Response.Status.CREATED).entity(activity).build();
     }