Cherry-pick r2717 from trunk to stable

BUG=804
Review URL: https://webrtc-codereview.appspot.com/774006

git-svn-id: http://webrtc.googlecode.com/svn/stable/src@2718 4adac7df-926f-26a2-2b94-8c16560cd09d
1 file changed