diff --git a/api/media_types.h b/api/media_types.h
index b2ff08c0c3..cd8b27b03e 100644
--- a/api/media_types.h
+++ b/api/media_types.h
@@ -15,16 +15,23 @@
 
 #include "rtc_base/system/rtc_export.h"
 
+namespace webrtc {
+
+enum class MediaType { ANY, AUDIO, VIDEO, DATA, UNSUPPORTED };
+
+}  // namespace webrtc
+
 // The cricket and webrtc have separate definitions for what a media type is.
-// They're not compatible. Watch out for this.
+// They used to be incompatible, but now cricket is defined in terms of the
+// webrtc definition.
 
 namespace cricket {
 
 enum MediaType {
-  MEDIA_TYPE_AUDIO,
-  MEDIA_TYPE_VIDEO,
-  MEDIA_TYPE_DATA,
-  MEDIA_TYPE_UNSUPPORTED
+  MEDIA_TYPE_AUDIO = static_cast<int>(webrtc::MediaType::AUDIO),
+  MEDIA_TYPE_VIDEO = static_cast<int>(webrtc::MediaType::VIDEO),
+  MEDIA_TYPE_DATA = static_cast<int>(webrtc::MediaType::DATA),
+  MEDIA_TYPE_UNSUPPORTED = static_cast<int>(webrtc::MediaType::UNSUPPORTED),
 };
 
 extern const char kMediaTypeAudio[];
@@ -35,10 +42,4 @@ RTC_EXPORT std::string MediaTypeToString(MediaType type);
 
 }  // namespace cricket
 
-namespace webrtc {
-
-enum class MediaType { ANY, AUDIO, VIDEO, DATA };
-
-}  // namespace webrtc
-
 #endif  // API_MEDIA_TYPES_H_
diff --git a/media/engine/fake_webrtc_call.cc b/media/engine/fake_webrtc_call.cc
index 76a70aaa57..c3d3755177 100644
--- a/media/engine/fake_webrtc_call.cc
+++ b/media/engine/fake_webrtc_call.cc
@@ -452,6 +452,7 @@ webrtc::NetworkState FakeCall::GetNetworkState(webrtc::MediaType media) const {
       return video_network_state_;
     case webrtc::MediaType::DATA:
     case webrtc::MediaType::ANY:
+    case webrtc::MediaType::UNSUPPORTED:
       ADD_FAILURE() << "GetNetworkState called with unknown parameter.";
       return webrtc::kNetworkDown;
   }
@@ -638,6 +639,7 @@ void FakeCall::SignalChannelNetworkState(webrtc::MediaType media,
       break;
     case webrtc::MediaType::DATA:
     case webrtc::MediaType::ANY:
+    case webrtc::MediaType::UNSUPPORTED:
       ADD_FAILURE()
           << "SignalChannelNetworkState called with unknown parameter.";
   }
diff --git a/pc/peer_connection_header_extension_unittest.cc b/pc/peer_connection_header_extension_unittest.cc
index 8bf6c7ab44..6ace2feaf6 100644
--- a/pc/peer_connection_header_extension_unittest.cc
+++ b/pc/peer_connection_header_extension_unittest.cc
@@ -199,9 +199,9 @@ TEST_P(PeerConnectionHeaderExtensionTest, NegotiatedExtensionsAreAccessible) {
 INSTANTIATE_TEST_SUITE_P(
     ,
     PeerConnectionHeaderExtensionTest,
-    Combine(Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan),
-            Values(cricket::MediaType::MEDIA_TYPE_AUDIO,
-                   cricket::MediaType::MEDIA_TYPE_VIDEO)),
+    Combine(Values(cricket::MediaType::MEDIA_TYPE_AUDIO,
+                   cricket::MediaType::MEDIA_TYPE_VIDEO),
+            Values(SdpSemantics::kPlanB, SdpSemantics::kUnifiedPlan)),
     [](const testing::TestParamInfo<
         PeerConnectionHeaderExtensionTest::ParamType>& info) {
       cricket::MediaType media_type;
diff --git a/sdk/android/api/org/webrtc/MediaStreamTrack.java b/sdk/android/api/org/webrtc/MediaStreamTrack.java
index 0249ffbfca..fc93bd8c65 100644
--- a/sdk/android/api/org/webrtc/MediaStreamTrack.java
+++ b/sdk/android/api/org/webrtc/MediaStreamTrack.java
@@ -30,8 +30,8 @@ public class MediaStreamTrack {
 
   // Must be kept in sync with cricket::MediaType.
   public enum MediaType {
-    MEDIA_TYPE_AUDIO(0),
-    MEDIA_TYPE_VIDEO(1);
+    MEDIA_TYPE_AUDIO(1),
+    MEDIA_TYPE_VIDEO(2);
 
     private final int nativeIndex;