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 767a44b67..5b7ce535a 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
@@ -1218,6 +1218,57 @@
                 </div>
             </div>
         </div>
+
+        <!-- runtime permission policy -->
+        <div class="wr-hidden-operation" data-operation="runtime-permission-policy">
+            <div class="panel panel-default operation-data" data-operation="runtime-permission-policy-body"
+                 data-operation-code="RUNTIME_PERMISSION_POLICY">
+                <div id="runtime-permission-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Runtime Permission Policy (COSU)
+                        <label id="runtime-permission-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#runtime-permission-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a runtime permission policy to an Android Device.
+                    </div>
+                </div>
+                <div id="runtime-permission-policy-body" class="panel-collapse panel-body collapse"
+                     role="tabpanel"
+                     aria-labelledby="runtime-permission-policy-body">
+                    <hr/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="runtime-permission-policy-window-start-time">
+                            Set runtime permission
+                            <span class="helper" title="When an app requests a runtime permission, this enforces whether the user needs to prompted or the permission either automatically granted or denied.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <select id="runtime-permission-policy-permission-type"
+                                class="form-control operationDataKeys"
+                                data-key="runtimePermissionPolicyPermissionType" data-default="0">
+                            <option value="1" selected="selected">PROMPT USER</option>
+                            <option value="2">AUTO GRANT</option>
+                            <option value="3">AUTO DENY</option>
+                        </select>
+                        <div>
+                            <ul class="message message-info">
+                                <i class="icon fw fw-info"></i>
+                                <a>
+                                    Already granted or denied permissions are not affected by this.
+                                </a>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+
         <!-- cosu-system-update-policy -->
         <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
             <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy-body"
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 07fe6950b..807524b60 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
@@ -69,6 +69,18 @@
             <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
+            <a href="javascript:void(0)" onclick="showAdvanceOperation('runtime-permission-policy', this)">
+            <span class="fw-stack fw-lg">
+                <i class="fw fw-application fw-stack-1x"></i>
+                <i class="fw fw-block fw-stack-2x"></i>
+            </span>
+                Runtime Permission Policy (COSU)
+                <span id="runtime-permission-policy-configured" class="has-configured status-icon hidden"><i
+                        class="fw fw-success"></i></span>
+                <span id="runtime-permission-policy-ok" class="has-success status-icon hidden"><i
+                        class="fw fw-success"></i></span>
+                <span id="runtime-permission-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+            </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)" class="hide">
             <span class="wr-hidden-operation-icon fw-stack">
                 <i class="fw fw-import fw-stack-2x"></i>
@@ -1315,6 +1327,56 @@
                 </div>
             </div>
         </div>
+        <!-- runtime permission policy -->
+        <div class="wr-hidden-operation" data-operation="runtime-permission-policy">
+            <div class="panel panel-default operation-data" data-operation="runtime-permission-policy-body"
+                 data-operation-code="RUNTIME_PERMISSION_POLICY">
+                <div id="runtime-permission-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Runtime Permission Policy (COSU)
+                        <label id="runtime-permission-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#runtime-permission-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a runtime permission policy to an Android Device.
+                    </div>
+                </div>
+                <div id="runtime-permission-policy-body" class="panel-collapse panel-body collapse"
+                     role="tabpanel"
+                     aria-labelledby="runtime-permission-policy-body">
+                    <hr/>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="runtime-permission-policy-window-start-time">
+                            Set runtime permission
+                            <span class="helper" title="When an app requests a runtime permission, this enforces whether the user needs to prompted or the permission either automatically granted or denied.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <select id="runtime-permission-policy-permission-type"
+                                class="form-control operationDataKeys"
+                                data-key="runtimePermissionPolicyPermissionType" data-default="0">
+                            <option value="1" selected="selected">PROMPT USER</option>
+                            <option value="2">AUTO GRANT</option>
+                            <option value="3">AUTO DENY</option>
+                        </select>
+                        <div>
+                            <ul class="message message-info">
+                                <i class="icon fw fw-info"></i>
+                                <a>
+                                    Already granted or denied permissions are not affected by this.
+                                </a>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+
         <!-- cosu-system-update-policy -->
         <div class="wr-hidden-operation hide" data-operation="cosu-system-update-policy">
             <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy"
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 6f21c8a10..f79302c43 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
@@ -1255,7 +1255,7 @@
                     <hr/>
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="runtime-permission-policy-window-start-time">
-                            Set runtime permission
+                            Set default runtime permission
                             <span class="helper" title="When an app requests a runtime permission, this enforces whether the user needs to prompted or the permission either automatically granted or denied.">
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
@@ -1275,6 +1275,90 @@
                                 </a>
                             </ul>
                         </div>
+
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="runtime-permission-applications">
+                                <br><br>Set permissions app-wise.
+                                <span class="helper" title="Add an application and set permission policy for a permission it needs.">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            </label>
+                            <br/>
+                            <a href="#runtime-permission-applications-grid" class="btn btn-secondary grid-input-add "
+                               data-click-event="add-form">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-circle-outline fw-stack-2x"></i>
+                                </span>
+                                Add Application
+                            </a>
+                            <div id="runtime-permission-applications"
+                                 class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                                 data-key="runtimePermissionApplications" data-column-count="2">
+                                <table class="table table-responsive table-striped">
+                                    <thead>
+                                    <tr>
+                                        <th>No:</th>
+                                        <th>Application</th>
+                                        <th>Package Name</th>
+                                        <th>Permission Name</th>
+                                        <th>Permission Type</th>
+                                        <th></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody data-add-form-container="#runtime-permission-applications-grid">
+                                    <tr data-help-text="add-form">
+                                        <td colspan="5">
+                                            No entries added yet .
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table class="template hidden">
+                                    <tbody data-add-form="#runtime-permission-applications-grid">
+                                    <tr data-add-form-element="clone">
+                                        <td data-title="No:">
+                                            <span class="index"></span>
+                                        </td>
+                                        <td data-title="App Name">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                                   maxlength="50" data-default="" placeholder="[ Gmail ]"/>
+                                        </td>
+                                        <td data-title="Package Name">
+                                            <input type="text" class="form-control grid-input-text"
+                                                   data-child-key="packageName" maxlength="100" data-default=""
+                                                   placeholder="[ com.google.android.gm ]"/>
+                                        </td>
+                                        <td data-title="Permission Name">
+                                            <input type="text" class="form-control grid-input-text"
+                                                   data-child-key="permissionName" maxlength="100" data-default=""
+                                                   placeholder="[ android.permission.READ_CALENDAR ]"/>
+                                        </td>
+                                        <td data-title="Runtime Permission">
+                                            <select id="runtime-permission-policy-permission-type"
+                                                    class="form-control operationDataKeys"
+                                                    data-key="permissionType" data-default="0">
+                                                <option value="1" selected="selected">PROMPT USER</option>
+                                                <option value="2">AUTO GRANT</option>
+                                                <option value="3">AUTO DENY</option>
+                                            </select>
+                                        </td>
+                                        <td>
+                                            <span class="list-group-item-actions">
+                                                <a href="#runtime-permission-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
+                                                    <span class="fw-stack helper" title="Remove Entry">
+                                                        <i class="fw fw-circle-outline fw-stack-2x"></i>
+                                                        <i class="fw fw-delete fw-stack-1x"></i>
+                                                    </span>
+                                                </a>
+                                            </span>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
                     </div>
                 </div>