Cherry-pick r2710 and r2711 from trunk to stable
Review URL: https://webrtc-codereview.appspot.com/778005

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