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-mod/public/js/operation-mod.js 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-mod/public/js/operation-mod.js
index 9db096b41..7bc120a3c 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-mod/public/js/operation-mod.js
+++ 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-mod/public/js/operation-mod.js
@@ -132,19 +132,19 @@ var androidOperationModule = function () {
                     "passcodePolicyMinComplexChars": operationPayload["minComplexChars"],
                     "passcodePolicyMaxPasscodeAgeInDays": operationPayload["maxPINAgeInDays"],
                     "passcodePolicyPasscodeHistory": operationPayload["pinHistory"],
-                    "passcodePolicyMaxFailedAttempts": operationPayload["maxFailedAttempts"]
+                    "passcodePolicyMaxFailedAttempts": operationPayload["maxFailedAttempts"],
+                    "passcodePolicyMaxTimeToLock": operationPayload["maxTimeToLock"],
+                    "passcodePolicyWPExist": operationPayload["passcodePolicyWPExist"]
                 };
                 if (operationPayload["passcodePolicyWPExist"] === true) {
-                    payload["passcodePolicyWPExist"] = operationPayload["passcodePolicyWPExist"];
-                    payload["passcodePolicyAllowSimpleWP"] = operationPayload.workProfilePasscode["passcodePolicyAllowSimpleWP"];
-                    payload["passcodePolicyRequireAlphanumericWP"] = operationPayload.workProfilePasscode["passcodePolicyRequireAlphanumericWP"];
-                    payload["passcodePolicyMinLengthWP"] = operationPayload.workProfilePasscode["passcodePolicyMinLengthWP"];
-                    payload["passcodePolicyMinComplexCharsWP"] = operationPayload.workProfilePasscode["passcodePolicyMinComplexCharsWP"];
-                    payload["passcodePolicyMaxPasscodeAgeInDaysWP"] = operationPayload.workProfilePasscode["passcodePolicyMaxPasscodeAgeInDaysWP"];
-                    payload["passcodePolicyPasscodeHistoryWP"] = operationPayload.workProfilePasscode["passcodePolicyPasscodeHistoryWP"];
-                    payload["passcodePolicyMaxFailedAttemptsWP"] = operationPayload.workProfilePasscode["passcodePolicyMaxFailedAttemptsWP"];
-                } else {
-                    payload["passcodePolicyWPExist"] = operationPayload["passcodePolicyWPExist"];
+                    payload["passcodePolicyAllowSimpleWP"] = operationPayload.workProfilePasscode["allowSimpleWP"];
+                    payload["passcodePolicyRequireAlphanumericWP"] = operationPayload.workProfilePasscode["requireAlphanumericWP"];
+                    payload["passcodePolicyMinLengthWP"] = operationPayload.workProfilePasscode["minLengthWP"];
+                    payload["passcodePolicyMinComplexCharsWP"] = operationPayload.workProfilePasscode["minComplexCharsWP"];
+                    payload["passcodePolicyMaxPasscodeAgeInDaysWP"] = operationPayload.workProfilePasscode["maxPINAgeInDaysWP"];
+                    payload["passcodePolicyPasscodeHistoryWP"] = operationPayload.workProfilePasscode["pinHistoryWP"];
+                    payload["passcodePolicyMaxFailedAttemptsWP"] = operationPayload.workProfilePasscode["maxFailedAttemptsWP"];
+                    payload["passcodePolicyMaxTimeToLockWP"] = operationPayload.workProfilePasscode["maxTimeToLockWP"];
                 }
                 break;
             case androidOperationConstants["CAMERA_OPERATION_CODE"]:
@@ -515,25 +515,24 @@ var androidOperationModule = function () {
                         "minComplexChars": operationData["passcodePolicyMinComplexChars"],
                         "maxPINAgeInDays": operationData["passcodePolicyMaxPasscodeAgeInDays"],
                         "pinHistory": operationData["passcodePolicyPasscodeHistory"],
-                        "maxFailedAttempts": operationData["passcodePolicyMaxFailedAttempts"]
+                        "maxFailedAttempts": operationData["passcodePolicyMaxFailedAttempts"],
+                        "maxTimeToLock": operationData["passcodePolicyMaxTimeToLock"],
+                        "passcodePolicyWPExist": operationData["passcodePolicyWPExist"]
                     }
                 };
                 workProfilePasscode = {};
                 if (operationData["passcodePolicyWPExist"] === true) {
-                    payload.operation["passcodePolicyWPExist"] = operationData["passcodePolicyWPExist"];
-                    workProfilePasscode["passcodePolicyAllowSimpleWP"] = operationData["passcodePolicyAllowSimpleWP"];
-                    workProfilePasscode["passcodePolicyRequireAlphanumericWP"] = operationData["passcodePolicyRequireAlphanumericWP"];
-                    workProfilePasscode["passcodePolicyMinLengthWP"] = operationData["passcodePolicyMinLengthWP"];
-                    workProfilePasscode["passcodePolicyMinComplexCharsWP"] = operationData["passcodePolicyMinComplexCharsWP"];
-                    workProfilePasscode["passcodePolicyMaxPasscodeAgeInDaysWP"] = operationData["passcodePolicyMaxPasscodeAgeInDaysWP"];
-                    workProfilePasscode["passcodePolicyPasscodeHistoryWP"] = operationData["passcodePolicyPasscodeHistoryWP"];
-                    workProfilePasscode["passcodePolicyMaxFailedAttemptsWP"] = operationData["passcodePolicyMaxFailedAttemptsWP"]  ;
+                    workProfilePasscode["allowSimpleWP"] = operationData["passcodePolicyAllowSimpleWP"];
+                    workProfilePasscode["requireAlphanumericWP"] = operationData["passcodePolicyRequireAlphanumericWP"];
+                    workProfilePasscode["minLengthWP"] = operationData["passcodePolicyMinLengthWP"];
+                    workProfilePasscode["minComplexCharsWP"] = operationData["passcodePolicyMinComplexCharsWP"];
+                    workProfilePasscode["maxPINAgeInDaysWP"] = operationData["passcodePolicyMaxPasscodeAgeInDaysWP"];
+                    workProfilePasscode["pinHistoryWP"] = operationData["passcodePolicyPasscodeHistoryWP"];
+                    workProfilePasscode["maxFailedAttemptsWP"] = operationData["passcodePolicyMaxFailedAttemptsWP"]  ;
+                    workProfilePasscode["maxTimeToLockWP"] = operationData["passcodePolicyMaxTimeToLockWP"];
                     payload.operation.workProfilePasscode = workProfilePasscode;
-                } else {
-                    payload["passcodePolicyWPExist"] = operationData["passcodePolicyWPExist"];
                 }
                 break;
-                break;
             case androidOperationConstants["APPLICATION_OPERATION_CODE"]:
                 payload = {
                     "operation": {
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 bd568a727..46a93b34e 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
@@ -328,6 +328,18 @@
                         </select>
                     </div>
 
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-time-to-lock">
+                            Time to auto lock seconds*
+                            <span class="helper" title="Time it takes lock a device automatially when idle">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                        </label>
+                        <input id="passcode-policy-max-time-to-lock" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyMaxTimeToLock" >
+                    </div>
+
                     <!--Passcode policy for work profile only-->
                     <h2 class="sub-title panel-title">Passcode policy for work profile</h2>
                     <div class="wr-input-control">
@@ -466,6 +478,19 @@
                             </select>
                         </div>
 
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wp-passcode-policy-max-time-to-lock">
+                                Time to auto lock seconds*
+                                <span class="helper" title="Time it takes lock a device automatially when idle">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                <br>
+                            </label>
+                            <input id="wp-passcode-policy-max-time-to-lock" type="text" class="form-control
+                        operationDataKeys"
+                                   data-key="passcodePolicyMaxTimeToLockWP" >
+                        </div>
+
                     </div>
                 </div>
             </div>
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 71cd6df7a..f5e58aa0e 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
@@ -310,6 +310,18 @@
                         </select>
                     </div>
 
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-time-to-lock">
+                            Time to auto lock seconds*
+                            <span class="helper" title="Time it takes lock a device automatially when idle">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                        </label>
+                        <input id="passcode-policy-max-time-to-lock" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyMaxTimeToLock" disabled>
+                    </div>
+
                     <!--Passcode policy for work profile only-->
                     <h2 class="sub-title panel-title">Passcode policy for work profile</h2>
                     <div class="wr-input-control">
@@ -447,6 +459,19 @@
                                 <option value="10">10</option>
                             </select>
                         </div>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wp-passcode-policy-max-time-to-lock">
+                                Time to auto lock seconds*
+                                <span class="helper" title="Time it takes lock a device automatially when idle">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                <br>
+                            </label>
+                            <input id="wp-passcode-policy-max-time-to-lock" type="text" class="form-control
+                        operationDataKeys"
+                                   data-key="passcodePolicyMaxTimeToLockWP" disabled>
+                        </div>
                     </div>
                 </div>
             </div>
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 033a82580..605d6f534 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
@@ -336,6 +336,18 @@
                         </select>
                     </div>
 
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-time-to-lock">
+                            Time to auto lock seconds*
+                            <span class="helper" title="Time it takes lock a device automatially when idle">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                        </label>
+                        <input id="passcode-policy-max-time-to-lock" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyMaxTimeToLock" >
+                    </div>
+
                     <!--Passcode policy for work profile only-->
                     <h2 class="sub-title panel-title">Passcode policy for work profile</h2>
                     <div class="wr-input-control">
@@ -474,6 +486,18 @@
                             </select>
                         </div>
 
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="wp-passcode-policy-max-time-to-lock">
+                                Time to auto lock seconds*
+                                <span class="helper" title="Time it takes lock a device automatially when idle">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                                <br>
+                            </label>
+                            <input id="wp-passcode-policy-max-time-to-lock" type="text" class="form-control
+                        operationDataKeys"
+                                   data-key="passcodePolicyMaxTimeToLockWP" >
+                        </div>
                     </div>
                 </div>
             </div>