Bug: webrtc:8287, webrtc:8288 Change-Id: If8937458c5b8f5a75b3de441aa409ae873f4bda2 Reviewed-on: https://webrtc-review.googlesource.com/3761 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20003}