Merging r2360, r2397 and r2398 from trunk.
Review URL: https://webrtc-codereview.appspot.com/636008

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