Bug: webrtc:8287, webrtc:8288 Change-Id: I69ab846851c308d51e23e2b3bc3b55b19d1a07e8 Reviewed-on: https://webrtc-review.googlesource.com/7300 Commit-Queue: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20281}