I have one downstream CL that needs to land first before landing this. Bug: webrtc:6828 Change-Id: Ib6f3ae78f83775278e4c2e4d34a93fe3748fb851 Reviewed-on: https://webrtc-review.googlesource.com/38340 Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21567}