diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 2938ffaa8b..e3f502bd90 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -107,7 +107,7 @@
         </Feature>
         <Feature code="CLEAR_PASSWORD">
             <Name>Clear Password</Name>
-            <Description>Clear current password</Description>
+            <Description>Clear current password (This functionality is only working with profile owners from Android 7.0 API 24 onwards.)</Description>
             <Operation context="/api/device-mgt/android/v1.0/admin/devices/clear-password" method="POST" type="application/json">
             </Operation>
         </Feature>
@@ -137,7 +137,7 @@
         </Feature>
         <Feature code="CHANGE_LOCK_CODE">
             <Name>Change Lock-code</Name>
-            <Description>Change current lock code</Description>
+            <Description>Change current lock code (This functionality is only working with profile owners from Android 7.0 API 24 onwards.)</Description>
             <Operation context="/api/device-mgt/android/v1.0/admin/devices/change-lock-code" method="POST" type="application/json">
             </Operation>
         </Feature>
diff --git a/pom.xml b/pom.xml
index 3bfb6166f3..d120bf6cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1215,7 +1215,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.0.191</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.0.196</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->