diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index bfdf8c9b6..b842bc0fe 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -72,8 +72,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
-import com.google.firebase.iid.FirebaseInstanceId;
-
 import org.linphone.call.CallActivity;
 import org.linphone.call.CallIncomingActivity;
 import org.linphone.activities.LinphoneActivity;
@@ -679,7 +677,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 				Log.i("[Push Notification] Assuming GCM jar is not provided.");
 			}
 		}else if (getString(R.string.push_type).equals("firebase")){
-			final String refreshedToken = FirebaseInstanceId.getInstance().getToken();
+			final String refreshedToken = com.google.firebase.iid.FirebaseInstanceId.getInstance().getToken();
 			if (refreshedToken != null) {
 				Log.i("[Push Notification] current token is: " + refreshedToken);
 				LinphonePreferences.instance().setPushNotificationRegistrationID(refreshedToken);
diff --git a/submodules/linphone b/submodules/linphone
index 963811044..2e8f7dade 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 963811044bcf6159f81f17d5cf2be754bbdeb258
+Subproject commit 2e8f7dade9dc7ec316a656094fa8e115d99b197b