Merge r7096 onto branch 38.

BUG=chrome:410456
R=mflodman@webrtc.org, pbos@webrtc.org

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

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