This CL fixes issue 7211 as well as adding a test that would have caught the issue. BUG=webrtc:7211,webrtc:6850,b/35471214 R=sprang@webrtc.org TBR=kthelgason, sprang Review-Url: https://codereview.webrtc.org/2713683002 . Cr-Commit-Position: refs/heads/master@{#16778}