Merge r7729 into M40 branch.

BUG=chromium:436400
TBR=phoglund@webrtc.org

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

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