This CL is a follow-up on https://webrtc-review.googlesource.com/c/src/+/8380 TBR=solenberg Bug: webrtc:7306 Change-Id: I26cd59d51f15b81d7262b6eb5fc64cbb256c8754 Reviewed-on: https://webrtc-review.googlesource.com/8440 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20249}