diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
index 39ed12cfa3..4e7f5f4c06 100644
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -556,6 +556,8 @@ public class VideoCapturerAndroid implements
     }
 
     camera.setParameters(parameters);
+    // Calculate orientation manually and send it as CVO instead.
+    camera.setDisplayOrientation(0 /* degrees */);
     if (!isCapturingToTexture) {
       queuedBuffers.clear();
       final int frameSize = captureFormat.frameSize();