diff --git a/.gitignore b/.gitignore
index a15ff3823..622ae11a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ local.properties
 res/.DS_Store
 res/raw/lpconfig.xsd
 .d
-app/google-services.json
 .*clang*
 **/*.iml
 **/.classpath
diff --git a/app/build.gradle b/app/build.gradle
index 179e94fbd..b98114dcd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -147,7 +147,7 @@ android {
 
 dependencies {
     if (firebaseEnabled()) {
-        implementation 'com.google.firebase:firebase-messaging:17.3.4'
+        implementation 'com.google.firebase:firebase-messaging:17.5.0'
     }
     implementation 'com.android.billingclient:billing:1.2'
     implementation 'org.apache.commons:commons-compress:1.18'
diff --git a/app/google-services.json b/app/google-services.json
new file mode 100644
index 000000000..c26aa7702
--- /dev/null
+++ b/app/google-services.json
@@ -0,0 +1,57 @@
+{
+  "project_info": {
+    "project_number": "929724111839",
+    "firebase_url": "https://linphone-android-8a563.firebaseio.com",
+    "project_id": "linphone-android-8a563",
+    "storage_bucket": "linphone-android-8a563.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:929724111839:android:4662ea9a056188c4",
+        "android_client_info": {
+          "package_name": "org.linphone"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "929724111839-co5kffto4j7dets7oolvfv0056cvpfbl.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.linphone",
+            "certificate_hash": "85463a95603f7b6331899b74b85d53d043dcd500"
+          }
+        },
+        {
+          "client_id": "929724111839-v5so1tcd65iil7dd7sde8jgii44h8luf.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCKrwWhkbA7Iy3wpEI8_ZvKOMp5jf6vV6A"
+        }
+      ]
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:929724111839:android:3cf90ee1d2f8fcb6",
+        "android_client_info": {
+          "package_name": "org.linphone.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "929724111839-v5so1tcd65iil7dd7sde8jgii44h8luf.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCKrwWhkbA7Iy3wpEI8_ZvKOMp5jf6vV6A"
+        }
+      ]
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java b/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java
index cc3ea9cfe..417bbccf4 100644
--- a/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java
+++ b/app/src/main/java/org/linphone/firebase/FirebaseMessaging.java
@@ -24,9 +24,7 @@ import static android.content.Intent.ACTION_MAIN;
 import android.content.Intent;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
-import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
-import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.LinphoneUtils;