Bug: webrtc:13555, webrtc:13082 Change-Id: Iff2cda6f516739419e97e975e03f77a98f74be03 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/249260 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: (Daniel.L) Byoungchan Lee <daniel.l@hpcnt.com> Cr-Commit-Position: refs/heads/main@{#35805}