Bug: webrtc:7385, webrtc:10198 Change-Id: Ib18b6fc45f1bac7f4145d4fca384978a85b6c85e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130481 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27461}