A revert of the CL was made in https://chromium-review.googlesource.com/c/559429/ Now upstream conflicts have been solved, and this is ready to reland. TBR=ossu@webrtc.org, tschumim@webrtc.org Bug: webrtc:7854 Change-Id: Idd08f28cf26036ad91eb7b7f73b2466dd9300f76 Reviewed-on: https://chromium-review.googlesource.com/565507 Commit-Queue: Minyue Li <minyue@webrtc.org> Reviewed-by: Minyue Li <minyue@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18985}