diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
index f5b762db0..fb8ef1177 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
@@ -20,7 +20,11 @@ package org.wso2.carbon.device.mgt.mobile.android.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.*;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.DeviceManager;
+import org.wso2.carbon.device.mgt.common.InitialOperationConfig;
+import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
+import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@@ -94,7 +98,8 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
                             HashMap<String, String> config = new HashMap<>();
                             config.put(FCM_API_KEY, this.getConfigProperty(configuration, FCM_API_KEY));
                             config.put(FCM_SENDER_ID, this.getConfigProperty(configuration, FCM_SENDER_ID));
-                            return new PushNotificationConfig(AndroidPluginConstants.NotifierType.FCM, config);
+                            return new PushNotificationConfig(AndroidPluginConstants.NotifierType.FCM, false,
+                                    config);
                         }
                     }
                 }
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 c18d18304..f36a7e3a3 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
@@ -51,9 +51,13 @@
     <ProvisioningConfig>
         <SharedWithAllTenants>true</SharedWithAllTenants>
     </ProvisioningConfig>
-
+    <!--
+    isScheduled element used to enable scheduler task to send push notification.
+    Task will send push notification as batches. So this will reduce sudden request burst when many devices try to
+    access server after receiving push notification.
+    -->
     <!--Configuration for enable firebase push notifications-->
-    <!--<PushNotificationProvider type="FCM">-->
+    <!--<PushNotificationProvider type="FCM" isScheduled="false">-->
     <!--</PushNotificationProvider>-->
 
     <DataSource>