Diff patch set 1 and 2 to see actual differences to the last patch. Bug: webrtc:6828 Change-Id: Ie0c85d41df47c2a2505bc71b20fdb3834bdeaf12 Reviewed-on: https://webrtc-review.googlesource.com/36920 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21492}