diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc
index 51d1451733..41cd0b22ae 100644
--- a/modules/audio_device/audio_device_data_observer.cc
+++ b/modules/audio_device/audio_device_data_observer.cc
@@ -20,10 +20,8 @@ namespace {
 // callback and redirects the PCM data to AudioDeviceDataObserver callback.
 class ADMWrapper : public AudioDeviceModule, public AudioTransport {
  public:
-  ADMWrapper(const int32_t id,
-             const AudioLayer audio_layer,
-             AudioDeviceDataObserver* observer)
-      : impl_(AudioDeviceModule::Create(id, audio_layer)), observer_(observer) {
+  ADMWrapper(const AudioLayer audio_layer, AudioDeviceDataObserver* observer)
+      : impl_(AudioDeviceModule::Create(audio_layer)), observer_(observer) {
     // Register self as the audio transport callback for underlying ADM impl.
     auto res = impl_->RegisterAudioCallback(this);
     is_valid_ = (impl_.get() != nullptr) && (res == 0);
@@ -308,11 +306,10 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport {
 }  // namespace
 
 rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceWithDataObserver(
-    const int32_t id,
     const AudioDeviceModule::AudioLayer audio_layer,
     AudioDeviceDataObserver* observer) {
   rtc::scoped_refptr<ADMWrapper> audio_device(
-      new rtc::RefCountedObject<ADMWrapper>(id, audio_layer, observer));
+      new rtc::RefCountedObject<ADMWrapper>(audio_layer, observer));
 
   if (!audio_device->IsValid()) {
     return nullptr;
diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc
index f4fdd119d6..a8321f402a 100644
--- a/modules/audio_device/audio_device_impl.cc
+++ b/modules/audio_device/audio_device_impl.cc
@@ -65,9 +65,7 @@
 namespace webrtc {
 
 // static
-// TODO(henrika): remove id parameter when all clients are updated.
 rtc::scoped_refptr<AudioDeviceModule> AudioDeviceModule::Create(
-    const int32_t id,
     const AudioLayer audio_layer) {
   RTC_LOG(INFO) << __FUNCTION__;
   // Create the generic reference counted (platform independent) implementation.
@@ -93,6 +91,14 @@ rtc::scoped_refptr<AudioDeviceModule> AudioDeviceModule::Create(
   return audioDevice;
 }
 
+// TODO(bugs.webrtc.org/7306): deprecated.
+rtc::scoped_refptr<AudioDeviceModule> AudioDeviceModule::Create(
+    const int32_t id,
+    const AudioLayer audio_layer) {
+  RTC_LOG(INFO) << __FUNCTION__;
+  return AudioDeviceModule::Create(audio_layer);
+}
+
 AudioDeviceModuleImpl::AudioDeviceModuleImpl(const AudioLayer audioLayer)
     : audio_layer_(audioLayer) {
   RTC_LOG(INFO) << __FUNCTION__;
diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc
index 8d44a5aedd..b42a1c7fbc 100644
--- a/modules/audio_device/audio_device_unittest.cc
+++ b/modules/audio_device/audio_device_unittest.cc
@@ -461,7 +461,7 @@ class AudioDeviceTest : public ::testing::Test {
     // rtc::LogMessage::LogTimestamps();
     // rtc::LogMessage::LogThreads();
     audio_device_ =
-        AudioDeviceModule::Create(0, AudioDeviceModule::kPlatformDefaultAudio);
+        AudioDeviceModule::Create(AudioDeviceModule::kPlatformDefaultAudio);
     EXPECT_NE(audio_device_.get(), nullptr);
     AudioDeviceModule::AudioLayer audio_layer;
     int got_platform_audio_layer =
diff --git a/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h
index 7bfc6b52d0..5720888acc 100644
--- a/modules/audio_device/include/audio_device.h
+++ b/modules/audio_device/include/audio_device.h
@@ -50,7 +50,9 @@ class AudioDeviceModule : public rtc::RefCountInterface {
 
  public:
   // Create an ADM.
-  // TODO(henrika): remove |id|.
+  static rtc::scoped_refptr<AudioDeviceModule> Create(
+      const AudioLayer audio_layer);
+  // TODO(bugs.webrtc.org/7306): deprecated.
   static rtc::scoped_refptr<AudioDeviceModule> Create(
       const int32_t id,
       const AudioLayer audio_layer);
diff --git a/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc b/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc
index 697f8e3670..40fb023f18 100644
--- a/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc
+++ b/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc
@@ -25,7 +25,7 @@ using webrtc::AudioDeviceModule;
 int main(int /*argc*/, char** /*argv*/) {
   // Create and initialize the ADM.
   rtc::scoped_refptr<AudioDeviceModule> adm(
-      AudioDeviceModule::Create(1, AudioDeviceModule::kPlatformDefaultAudio));
+      AudioDeviceModule::Create(AudioDeviceModule::kPlatformDefaultAudio));
   if (!adm.get()) {
     fprintf(stderr, "Failed to create Audio Device Module.\n");
     return 1;
diff --git a/voice_engine/voe_base_impl.cc b/voice_engine/voe_base_impl.cc
index 6901bf5c6f..9848557cbc 100644
--- a/voice_engine/voe_base_impl.cc
+++ b/voice_engine/voe_base_impl.cc
@@ -160,7 +160,6 @@ int VoEBaseImpl::Init(
 #else
     // Create the internal ADM implementation.
     shared_->set_audio_device(AudioDeviceModule::Create(
-        VoEId(shared_->instance_id(), -1),
         AudioDeviceModule::kPlatformDefaultAudio));
     if (shared_->audio_device() == nullptr) {
       RTC_LOG(LS_ERROR) << "Init() failed to create the ADM";