Merge r6774 to branch 3.55.

See https://webrtc-codereview.appspot.com/13989004

R=asapersson@webrtc.org

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

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