Original CL by eladalon@ (https://codereview.chromium.org/2929213002/). Bug: webrtc:7786, webrtc:8287, webrtc:8288 Change-Id: I1eaabfbd26b04882b65a3f2a779dd43b953553a6 Reviewed-on: https://webrtc-review.googlesource.com/4721 Reviewed-by: Elad Alon <eladalon@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20070}