f18841a843
https://webrtc-review.googlesource.com/c/src/+/259457 was a cherry-pick to M102; as such changes were not made there to keep the merge to just what had already landed. This addresses the issues raised on that CL. Bug: chromium:1316478 Change-Id: I94fad0aa6fe9c67aee5a2f2158524d75b51db48e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259660 Auto-Submit: Alexander Cooper <alcooper@chromium.org> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#36631}