Bug: webrtc:7306, webrtc:10198 Change-Id: Iaeef4d7449c18325511f1763eba510b385959bfe Reviewed-on: https://webrtc-review.googlesource.com/c/118446 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26383}