This CL includes follow-up changes from https://webrtc-review.googlesource.com/c/src/+/324280 Bug: none Change-Id: I6abad16e05cac7197c51ffa7b1d3fb991843df6e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/325243 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41030}