diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc
index d11c852f19f..3e8de6c528a 100644
--- a/media/engine/webrtc_video_engine.cc
+++ b/media/engine/webrtc_video_engine.cc
@@ -54,8 +54,7 @@ const int kMinLayerSize = 16;
 // If this field trial is enabled, we will enable sending FlexFEC and disable
 // sending ULPFEC whenever the former has been negotiated in the SDPs.
 bool IsFlexfecFieldTrialEnabled() {
-  //return webrtc::field_trial::IsEnabled("WebRTC-FlexFEC-03");
-  return true;
+  return webrtc::field_trial::IsEnabled("OWT-FlexFEC");
 }
 
 // If this field trial is enabled, the "flexfec-03" codec will be advertised
@@ -65,8 +64,7 @@ bool IsFlexfecFieldTrialEnabled() {
 // MediaSession and added as "a=ssrc:" and "a=ssrc-group:" lines in the local
 // SDP.
 bool IsFlexfecAdvertisedFieldTrialEnabled() {
-  //return webrtc::field_trial::IsEnabled("WebRTC-FlexFEC-03-Advertised");
-  return true;
+  return webrtc::field_trial::IsEnabled("OWT-FlexFEC");
 }
 
 void AddDefaultFeedbackParams(VideoCodec* codec) {
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index eebf952427c..fabae9fdd81 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -29,8 +29,10 @@ rtc_library("congestion_controller") {
   if (owt_use_gpra) {
     # use Intel Goodput Rate Adapatation BWE
       include_dirs = [ owt_gpra_header_root ]
-      libs = [ "gpra_lib.lib" ]
-      lib_dirs = [ owt_gpra_lib_root ]
+      if (is_win && owt_gpra_lib_root != "") {
+        libs = [ "gpra_lib.lib" ]
+        lib_dirs = [ owt_gpra_lib_root ]
+      }
       defines += [ "INTEL_GPRA" ]
   }
 
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index e507446225a..eceda4e57c6 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -28,8 +28,10 @@ rtc_library("goog_cc") {
   if (owt_use_gpra) {
     # use Intel Goodput Rate Adapatation BWE
       include_dirs = [ owt_gpra_header_root ]
-      libs = [ "gpra_lib.lib" ]
-      lib_dirs = [ owt_gpra_lib_root ]
+      if (is_win && owt_gpra_lib_root != "") {
+        libs = [ "gpra_lib.lib" ]
+        lib_dirs = [ owt_gpra_lib_root ]
+      }
       defines += [ "INTEL_GPRA" ]
   }