This CL includes the changes from this CL: https://webrtc-review.googlesource.com/c/src/+/63642 Bug: webrtc:8955 Change-Id: If95cdec59f25e97c6ff5ea45a52d6113128a0921 Reviewed-on: https://webrtc-review.googlesource.com/64822 Commit-Queue: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22910}