Merge r6544 to 3.55 branch.

BUG=3518
R=stefan@webrtc.org

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

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