This CL was submitted as issue https://webrtc-codereview.appspot.com/4849004/, but was reverted because of flakiness. This new issue will correct that. Patch Set 1 contains the code that was submitted in 4849004. BUG=2428 R=pbos@webrtc.org, phoglund@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5399004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5251 4adac7df-926f-26a2-2b94-8c16560cd09d