This simplifies the code and removes the need for a lot of bookkeeping variables. Bug: webrtc:9232 Change-Id: I0c9a4b0741ed5353caa22ba5acdcb166357441f2 Reviewed-on: https://webrtc-review.googlesource.com/74240 Commit-Queue: Sebastian Jansson <srte@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23149}