Original change by isheriff@chromium.org: http://crrev.com/2387463002#ps40001 BUG=webrtc:6332 TBR=philipel@webrtc.org, stefan@webrtc.org Review URL: https://codereview.webrtc.org/2432633002 . Patch from Irfan Sheriff <isheriff@chromium.org>. Cr-Commit-Position: refs/heads/master@{#14673}