diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc
index 32c085d3e0..59402a2029 100644
--- a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc
@@ -75,6 +75,7 @@ int64_t NetEqPerformanceTest::Run(int runtime_ms,
   // Main loop.
   webrtc::Clock* clock = webrtc::Clock::GetRealTimeClock();
   int64_t start_time_ms = clock->TimeInMilliseconds();
+  AudioFrame out_frame;
   while (time_now_ms < runtime_ms) {
     while (packet_input_time_ms <= time_now_ms) {
       // Drop every N packets, where N = FLAGS_lossrate.
@@ -104,7 +105,6 @@ int64_t NetEqPerformanceTest::Run(int runtime_ms,
     }
 
     // Get output audio, but don't do anything with it.
-    AudioFrame out_frame;
     int error = neteq->GetAudio(&out_frame);
     if (error != NetEq::kOK)
       return -1;
diff --git a/webrtc/modules/include/module_common_types.h b/webrtc/modules/include/module_common_types.h
index 706eea3685..6074eec793 100644
--- a/webrtc/modules/include/module_common_types.h
+++ b/webrtc/modules/include/module_common_types.h
@@ -541,6 +541,8 @@ class AudioFrame {
   RTC_DISALLOW_COPY_AND_ASSIGN(AudioFrame);
 };
 
+// TODO(henrik.lundin) Can we remove the call to data_()?
+// See https://bugs.chromium.org/p/webrtc/issues/detail?id=5647.
 inline AudioFrame::AudioFrame()
     : data_() {
   Reset();