diff --git a/infra/DEBUG/debug_args.gn b/infra/DEBUG/debug_args.gn
index 5315e0a9..2da11d97 100644
--- a/infra/DEBUG/debug_args.gn
+++ b/infra/DEBUG/debug_args.gn
@@ -47,6 +47,7 @@ enable_discovery = true
 enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
+# Set to false for Polly build
 clang_use_chrome_plugins = true
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = true
@@ -58,12 +59,11 @@ use_vaapi = true
 enable_library_cdms = true
 enable_widevine = true
 bundle_widevine_cdm = false
-enable_widevine_cdm_component = true
+# enable_widevine_cdm_component = true
 enable_cdm_host_verification = false
-enable_widevine_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
-enable_media_overlay = true
+# enable_media_overlay = true
 enable_hangout_services_extension = true
 rtc_use_h264 = true
 rtc_include_ilbc = true
diff --git a/infra/DEBUG/win_debug_args.gn b/infra/DEBUG/win_debug_args.gn
index bfcdc6c9..dd23e010 100644
--- a/infra/DEBUG/win_debug_args.gn
+++ b/infra/DEBUG/win_debug_args.gn
@@ -44,6 +44,8 @@ enable_discovery = false
 enable_cros_media_app = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
+# Set to false for Polly build
+clang_use_chrome_plugins = true
 enable_ffmpeg_video_decoders = true
 is_component_ffmpeg = false
 use_webaudio_ffmpeg = false
@@ -53,13 +55,12 @@ use_webaudio_pffft = true
 enable_library_cdms = true
 enable_widevine = true
 bundle_widevine_cdm = false
-enable_widevine_cdm_component = true
+# enable_widevine_cdm_component = true
 # enable_media_foundation_widevine_cdm = true
 enable_cdm_host_verification = false
-enable_widevine_cdm_host_verification = false
 ignore_missing_widevine_signing_cert = true
 enable_media_drm_storage = true
-enable_media_overlay = true
+# enable_media_overlay = true
 enable_hangout_services_extension = true
 rtc_use_h264 = true
 rtc_include_ilbc = true