diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
index 6b29e84868..e358f19e63 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidFeatureManager.java
@@ -240,6 +240,16 @@ public class AndroidFeatureManager implements FeatureManager {
         feature.setName("Message");
         feature.setDescription("Send message");
         supportedFeatures.add(feature);
+        feature = new Feature();
+        feature.setCode("DEVICE_REBOOT");
+        feature.setName("Reboot");
+        feature.setDescription("Reboot the device");
+        supportedFeatures.add(feature);
+        feature = new Feature();
+        feature.setCode("UPGRADE_FIRMWARE");
+        feature.setName("Upgrade Firmware");
+        feature.setDescription("Upgrade Firmware");
+        supportedFeatures.add(feature);
         return supportedFeatures;
     }
 }
\ No newline at end of file