diff --git a/aware-phone/build.gradle b/aware-phone/build.gradle
index b218cb39..aca5ad94 100755
--- a/aware-phone/build.gradle
+++ b/aware-phone/build.gradle
@@ -63,7 +63,8 @@ android {
         abi {
             enable true
             reset()
-            include 'armeabi', 'x86', 'arm64'
+            include 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
+            universalApk true
         }
     }
 
diff --git a/build.gradle b/build.gradle
index 1bf58ea4..074107a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mqtt_libs = '1.2.2'
         ion_libs = "2.+"
         google_libs = "17.0.0"
-        version_code = 818
+        version_code = 819
         version_readable = "4.0." + version_code + "." + "bundle"
         compile_sdk = 28
         target_sdk = 28
diff --git a/com.aware.plugin.esm.scheduler b/com.aware.plugin.esm.scheduler
index 787efe1d..3eef6397 160000
--- a/com.aware.plugin.esm.scheduler
+++ b/com.aware.plugin.esm.scheduler
@@ -1 +1 @@
-Subproject commit 787efe1ded3035e3e227d8b3bde3a14e9da41f64
+Subproject commit 3eef63977542d01ca8b5e94ba4833227d078cd59