diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
index 0e3ea0cf07..e40a17cd14 100644
--- a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
+++ b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
@@ -36,8 +36,6 @@ import org.webrtc.AudioTrack;
 import org.webrtc.CameraVideoCapturer;
 import org.webrtc.DataChannel;
 import org.webrtc.EglBase;
-import org.webrtc.HardwareVideoDecoderFactory;
-import org.webrtc.HardwareVideoEncoderFactory;
 import org.webrtc.IceCandidate;
 import org.webrtc.Logging;
 import org.webrtc.MediaConstraints;
@@ -341,7 +339,6 @@ public class PeerConnectionClient {
     createPeerConnection(
         localRender, Collections.singletonList(remoteRender), videoCapturer, signalingParameters);
   }
-
   public void createPeerConnection(final VideoSink localRender,
       final List<VideoRenderer.Callbacks> remoteRenders, final VideoCapturer videoCapturer,
       final SignalingParameters signalingParameters) {
@@ -512,12 +509,7 @@ public class PeerConnectionClient {
     if (options != null) {
       Log.d(TAG, "Factory networkIgnoreMask option: " + options.networkIgnoreMask);
     }
-    final boolean enableH264HighProfile =
-        peerConnectionParameters.videoCodec.equals(VIDEO_CODEC_H264_HIGH);
-    factory = new PeerConnectionFactory(options,
-        new HardwareVideoEncoderFactory(rootEglBase.getEglBaseContext(),
-            true /* enableIntelVp8Encoder */, enableH264HighProfile),
-        new HardwareVideoDecoderFactory(rootEglBase.getEglBaseContext()));
+    factory = new PeerConnectionFactory(options);
     Log.d(TAG, "Peer connection factory created.");
   }
 
diff --git a/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc
index 55ebeef219..ceecda2bf2 100644
--- a/sdk/android/src/jni/videoencoderwrapper.cc
+++ b/sdk/android/src/jni/videoencoderwrapper.cc
@@ -97,6 +97,8 @@ VideoEncoderWrapper::VideoEncoderWrapper(JNIEnv* jni, jobject j_encoder)
 
   implementation_name_ = GetImplementationName(jni);
 
+  encoder_queue_ = rtc::TaskQueue::Current();
+
   initialized_ = false;
   num_resets_ = 0;
 
@@ -114,7 +116,6 @@ int32_t VideoEncoderWrapper::InitEncode(const VideoCodec* codec_settings,
   number_of_cores_ = number_of_cores;
   codec_settings_ = *codec_settings;
   num_resets_ = 0;
-  encoder_queue_ = rtc::TaskQueue::Current();
 
   return InitEncodeInternal(jni);
 }
@@ -166,7 +167,6 @@ int32_t VideoEncoderWrapper::Release() {
   jobject ret = jni->CallObjectMethod(*encoder_, release_method_);
   frame_extra_infos_.clear();
   initialized_ = false;
-  encoder_queue_ = nullptr;
   return HandleReturnCode(jni, ret);
 }