Merge webrtc r7301 to M39 branch. 

TBR=juberti@webrtc.org 

BUG=414211

Review URL: https://webrtc-codereview.appspot.com/29679004

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