diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default
index c2acb3c86..8b595473c 100644
--- a/res/raw/linphonerc_default
+++ b/res/raw/linphonerc_default
@@ -1,6 +1,4 @@
-[net]
-download_bw=380
-upload_bw=380
+
 
 [sip]
 contact="Linphone Android" <sip:linphone.android@unknown-host>
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 469cd3f67..ef6c75878 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -4,6 +4,9 @@
 #Paths to resources must be set from LinphoneManager, after creating LinphoneCore.
 [net]
 mtu=1300
+#Because dynamic bitrate adaption can increase bitrate, we must allow "no limit"
+download_bw=0
+upload_bw=0
 
 [sip]
 guess_hostname=1
diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index b1a8b6de0..e4cddacab 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -927,20 +927,6 @@ public class LinphonePreferences {
 
 	public void setPreferredVideoSize(String preferredVideoSize) {
 		getLc().setPreferredVideoSizeByName(preferredVideoSize);
-		String preset = getVideoPreset();
-		if (!preset.equals("custom")) {
-			int bandwidth = 512;
-			if (preferredVideoSize.equals("720p")) {
-				bandwidth = 1024 + 128;
-			} else if (preferredVideoSize.equals("vga")) {
-				bandwidth = 660;
-			} else if (preferredVideoSize.equals("qvga")) {
-				bandwidth = 380;
-			} else if (preferredVideoSize.equals("qcif")) {
-				bandwidth = 256;
-			}
-			setBandwidthLimit(bandwidth);
-		}
 	}
 
 	public int getPreferredVideoFps() {
diff --git a/submodules/linphone b/submodules/linphone
index ddd080522..7e2a6a56f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ddd08052226c879df63b08ab11d4a4917cfc1da5
+Subproject commit 7e2a6a56fa6a70a6ec3875cea26f1f1e17910917
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 6b78f9562..410fca273 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6b78f95624660c4e1160c3caac74732250321ce1
+Subproject commit 410fca273a8cf0de5992cd2c0d84bbb8e297a097
diff --git a/submodules/oRTP b/submodules/oRTP
index ce3dedb58..5f8fcddce 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit ce3dedb58706f154c647bc99412aca8a42416d9d
+Subproject commit 5f8fcddce392f1510768949a4691f9e8c170badb