Reverse Merged r2884 & r2888 from trunk.
Review URL: https://webrtc-codereview.appspot.com/929005

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@2988 4adac7df-926f-26a2-2b94-8c16560cd09d
11 files changed