diff --git a/config/common.mk b/config/common.mk
index 1126accc..9f123974 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -135,6 +135,10 @@ PRODUCT_PACKAGES += \
     libemoji \
     Terminal
 
+# Include librsjni explicitly to workaround GMS issue
+PRODUCT_PACKAGES += \
+    librsjni
+
 # Custom CM packages
 PRODUCT_PACKAGES += \
     Launcher3 \