Bug: webrtc:5118 Change-Id: I034b839dd20e0840c1dd090af7c97e9713634638 Reviewed-on: https://webrtc-review.googlesource.com/5364 Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> Reviewed-by: Henrik Grunell <henrikg@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20099}