TBR=danilchap@webrtc.org Bug: webrtc:9361, webrtc:9582 Change-Id: I0303fc89bafab59e68ec81979e0e4372e79a4f51 Reviewed-on: https://webrtc-review.googlesource.com/91866 Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24170}