First version was reverted in https://webrtc-review.googlesource.com/c/src/+/97941. The issue is now fixed. TBR=ivoc Bug: b/113648245 Change-Id: If631fdea95aa963952f15e48e9d2d678797dc225 Reviewed-on: https://webrtc-review.googlesource.com/97942 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Reviewed-by: Ivo Creusen <ivoc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24573}