This is a reland of https://webrtc-review.googlesource.com/c/121569. Should be safe as a followup to https://webrtc-review.googlesource.com/c/src/+/184508. Bug: webrtc:10147 Change-Id: I03398b713348e0d0feb598c54ea3bd332b19b1ac Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/184930 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Tommi <tommi@webrtc.org> Reviewed-by: Henrik Boström <hbos@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32159}