Landing issue 15189004

TBR=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6951 4adac7df-926f-26a2-2b94-8c16560cd09d