We might end up reverting this, but we need to get it committed and merged to stable in order to test in a webrtc roll. TBR=niklas.enbom BUG=webrtc:830 Review URL: https://webrtc-codereview.appspot.com/1439004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3978 4adac7df-926f-26a2-2b94-8c16560cd09d