Patch set 1 is identical to original CL. Next one adds fix for backwards compatibilit. Original cl: https://webrtc-review.googlesource.com/c/src/+/144037 Bug: webrtc:10774 Change-Id: Ib72e3723c7a07e9ee83f97560a85367becd868a1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144601 Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28485}