diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
index df84b7e50..c41797a2c 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
@@ -120,7 +120,9 @@
                                             <input type="{{this.type}}" id="{{this.id}}"
                                                    class="checkbox"
                                                    placeholder="{{this.label}}"
-                                                   data-param-type="form"/>
+                                                   data-param-type="form"
+                                                   data-toggle="tooltip"
+                                                   title="{{this.helper}}"/>
                                             {{this.label}}
                                             <br/>
                                         {{/equal}}
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/operation-bar.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/operation-bar.hbs
index 2fd7b7990..c76e48859 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/operation-bar.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/operation-bar.hbs
@@ -120,7 +120,9 @@
                                             <input type="{{this.type}}" id="{{this.id}}"
                                                    class="checkbox"
                                                    placeholder="{{this.label}}"
-                                                   data-param-type="form"/>
+                                                   data-param-type="form"
+                                                   data-toggle="tooltip"
+                                                   title="{{this.helper}}"/>
                                             {{this.label}}
                                             <br/>
                                         {{/equal}}
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index faeb8bcb6..28dac3063 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -508,9 +508,8 @@
                         <div>
                             <ul class="message message-info">
                                 <i class="icon fw fw-info"></i>
-                                <a id="policy-listing-status-msg">Below restrictions will be applied on devices with
-                                                                  Android
-                                                                  version 6.0 Marshmallow onwards only.</a>
+                                <a id="policy-listing-status-msg">Below restrictions will be applicable when the agent is the
+                                    <b>device owner</b> and Android version 6.0 (Marshmallow) or higher.</a>
                             </ul>
                         </div>
                         <br>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
index be24a42f5..f93acffe7 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
@@ -756,8 +756,14 @@
                             </span>
                         </label>
                     </div>
-                    <br>
-
+                <div class="">
+                    <ul class="message message-info">
+                        <i class="icon fw fw-info"></i>
+                        <a id="policy-listing-status-msg">Below restrictions will be applicable when the agent is the
+                            <b>device owner</b> and Android version 6.0 (Marshmallow) or higher.</a>
+                    </ul>
+                </div>
+                <br>
                 <div class="wr-input-control">
                     <label class="wr-input-control checkbox">
                         <input id="disallow-set-wallpeper" type="checkbox"
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
index cd1837cd9..0774c1ca7 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -518,8 +518,8 @@
                         <div class="">
                             <ul class="message message-info">
                                 <i class="icon fw fw-info"></i>
-                                <a id="policy-listing-status-msg">Below restrictions will be applied on devices with
-                                                                  Android version 6.0 Marshmallow onwards only.</a>
+                                <a id="policy-listing-status-msg">Below restrictions will be applicable when the agent is the
+                                    <b>device owner</b> and Android version 6.0 (Marshmallow) or higher.</a>
                             </ul>
                         </div>
                     <br>
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 50a1bd835..5ff8daf82 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
@@ -132,7 +132,8 @@
                         <uiParam optional="true">
                             <type>checkbox</type>
                             <id>hard-lock</id>
-                            <label>Hard lock enabled</label>
+                            <label>Hard lock enabled (OEM Mode Only)</label>
+                            <helper>This feature is only available in OEM Mode.</helper>
                         </uiParam>
                     </uiParams>
                 </params>