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 4a692358c..510f0a3cb 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
@@ -1015,11 +1015,9 @@
                             <input id="manual-proxy-configuration-radio-button" type="radio" name="global-proxy-config-type"
                                    class="form-control operationDataKeys" data-key="proxyConfigType"
                                    value="manual"
-                                   onload="switchPaneAgainstValueSetForRadioButtons(this,
-                                 'global-proxy-configuration-type-', ['manual','auto'])"
-                                   onchange="switchPaneAgainstValueSetForRadioButtons(this,
-                                 'global-proxy-configuration-type-', ['manual','auto'])" checked/>
-                            <span class="helper"title="Manually enter proxy configurations.">
+                                   onclick="switchPaneAgainstValueSetForRadioButtons(this,
+                                 'global-proxy-configuration-type-', ['manual','auto'])"/>
+                            <span class="helper" title="Manually enter proxy configurations.">
                               Manual
                           </span>
                         </label>
@@ -1027,9 +1025,7 @@
                             <input id="auto-proxy-configuration-radio-button" type="radio" name="global-proxy-config-type"
                                    class="form-control operationDataKeys" data-key="proxyConfigType"
                                    value="auto"
-                                   onload="switchPaneAgainstValueSetForRadioButtons(this,
-                                   'global-proxy-configuration-type-', ['auto','manual'])"
-                                   onchange="switchPaneAgainstValueSetForRadioButtons(this,
+                                   onclick="switchPaneAgainstValueSetForRadioButtons(this,
                                    'global-proxy-configuration-type-', ['auto','manual'])"/>
                             <span class="helper"
                                   title="Proxy configurations will be automatically fetched from Proxy PAC file.">
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 1cce8875b..cc7298980 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
@@ -1020,6 +1020,8 @@
                         <label class="wr-input-control radio light">
                             <input id="manual-proxy-configuration-radio-button" type="radio"
                                    name="global-proxy-config-type"
+                                   onclick="switchPaneAgainstValueSetForRadioButtons(this,
+                                   'global-proxy-configuration-type-', ['manual','auto'])"
                                    class="form-control operationDataKeys" data-key="proxyConfigType"
                                    value="manual" disabled/>
                             <span class="helper" title="Manually enter proxy configurations.">
@@ -1029,6 +1031,8 @@
                         <label class="wr-input-control radio light">
                             <input id="auto-proxy-configuration-radio-button" type="radio"
                                    name="global-proxy-config-type"
+                                   onclick="switchPaneAgainstValueSetForRadioButtons(this,
+                                   'global-proxy-configuration-type-', ['auto','manual'])"
                                    class="form-control operationDataKeys" data-key="proxyConfigType"
                                    value="auto" disabled/>
                             <span class="helper"
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 376405224..89137a232 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
@@ -1039,11 +1039,9 @@
                             <input id="manual-proxy-configuration-radio-button" type="radio" name="global-proxy-config-type"
                                    class="form-control operationDataKeys" data-key="proxyConfigType"
                                    value="manual"
-                                   onload="switchPaneAgainstValueSetForRadioButtons(this,
-                                 'global-proxy-configuration-type-', ['manual','auto'])"
-                                   onchange="switchPaneAgainstValueSetForRadioButtons(this,
-                                 'global-proxy-configuration-type-', ['manual','auto'])" checked/>
-                            <span class="helper"title="Manually enter proxy configurations.">
+                                   onclick="switchPaneAgainstValueSetForRadioButtons(this,
+                                   'global-proxy-configuration-type-', ['manual','auto'])" checked/>
+                            <span class="helper" title="Manually enter proxy configurations.">
                               Manual
                           </span>
                         </label>
@@ -1051,9 +1049,7 @@
                             <input id="auto-proxy-configuration-radio-button" type="radio" name="global-proxy-config-type"
                                    class="form-control operationDataKeys" data-key="proxyConfigType"
                                    value="auto"
-                                   onload="switchPaneAgainstValueSetForRadioButtons(this,
-                                   'global-proxy-configuration-type-', ['auto','manual'])"
-                                   onchange="switchPaneAgainstValueSetForRadioButtons(this,
+                                   onclick="switchPaneAgainstValueSetForRadioButtons(this,
                                    'global-proxy-configuration-type-', ['auto','manual'])"/>
                             <span class="helper"
                                   title="Proxy configurations will be automatically fetched from Proxy PAC file.">
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 ab7141b8d..30fc71bd6 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
@@ -163,6 +163,10 @@
             <Name>Wifi</Name>
             <Description>Setting up wifi configuration</Description>
         </Feature>
+        <Feature code="GLOBAL_PROXY">
+            <Name>Global Proxy</Name>
+            <Description>Setting up a network-independent global HTTP proxy on a device.</Description>
+        </Feature>
         <Feature code="CAMERA">
             <Name>Camera</Name>
             <Description>Enable or disable camera</Description>