diff --git a/.gitignore b/.gitignore
index afccd0b7b..7e8c7a41b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ project.properties
 res/.DS_Store
 res/raw/lpconfig.xsd
 res/raw/rootca.pem
+res/raw/*_grammar
 submodules/externals/build/cunit/CUnit/
 submodules/externals/build/ffmpeg/arm/
 submodules/externals/build/ffmpeg/x86
diff --git a/gradle.properties b/gradle.properties
index 4aca4f094..818481447 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ RELEASE_STORE_PASSWORD=
 RELEASE_KEY_ALIAS=
 RELEASE_KEY_PASSWORD=
 
-org.gradle.jvmargs=-XX\:MaxHeapSize\=2048M -Xmx2048M
-#org.gradle.jvmargs=-Xmx1536M
+#org.gradle.jvmargs=-XX\:MaxHeapSize\=2048M -Xmx2048M
+org.gradle.jvmargs=-Xmx1536M
diff --git a/prepare.py b/prepare.py
index ffad5392d..d42cf4b03 100755
--- a/prepare.py
+++ b/prepare.py
@@ -333,16 +333,16 @@ copy-libs:
 \t\tcp -R liblinphone-sdk/android-x86/share/linphonej/java/* src/linphone-wrapper; \\
 \tfi
 \tif test -d "liblinphone-sdk/android-arm/share/belr/grammars"; then \\
-\t\tcp liblinphone-sdk/android-arm/share/belr/grammars/cpim_grammar res/raw/; \\
+\t\tcp liblinphone-sdk/android-arm/share/belr/grammars/*_grammar res/raw/; \\
 \tfi
 \tif test -d "liblinphone-sdk/android-armv7/share/belr/grammars"; then \\
-\t\tcp liblinphone-sdk/android-armv7/share/belr/grammars/cpim_grammar res/raw/; \\
+\t\tcp liblinphone-sdk/android-armv7/share/belr/grammars/*_grammar res/raw/; \\
 \tfi
 \tif test -d "liblinphone-sdk/android-arm64/share/belr/grammars"; then \\
-\t\tcp liblinphone-sdk/android-arm64/share/belr/grammars/cpim_grammar res/raw/; \\
+\t\tcp liblinphone-sdk/android-arm64/share/belr/grammars/*_grammar res/raw/; \\
 \tfi
 \tif test -d "liblinphone-sdk/android-x86/share/belr/grammars"; then \\
-\t\tcp liblinphone-sdk/android-x86/share/belr/grammars/cpim_grammar res/raw/; \\
+\t\tcp liblinphone-sdk/android-x86/share/belr/grammars/*_grammar res/raw/; \\
 \tfi
 
 copy-libs-mediastreamer:
diff --git a/res/raw/vcard_grammar b/res/raw/vcard_grammar
deleted file mode 100644
index 48ceb8e37..000000000
Binary files a/res/raw/vcard_grammar and /dev/null differ
diff --git a/submodules/belcard b/submodules/belcard
index 7376c8ba9..b1622d7dd 160000
--- a/submodules/belcard
+++ b/submodules/belcard
@@ -1 +1 @@
-Subproject commit 7376c8ba975617c8b2a7232c3acc428513a4ae8f
+Subproject commit b1622d7ddf1cbe6a0f929537861dfa8b45b293c4
diff --git a/submodules/linphone b/submodules/linphone
index 836cbdf97..cede35839 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 836cbdf97f28539b80200ac62d9faeb01d4387e9
+Subproject commit cede358396b9a21267a17e1ed83f20a481832615