Bug: webrtc:9412, webrtc:9487 Change-Id: I68e5a03026b1ab8236a05ece79690d4a8755c093 Reviewed-on: https://webrtc-review.googlesource.com/86947 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23851}