I had to take few steps to solve this issue. I have comments on places I made cahanges to clarify why I did the change. Review URL: https://webrtc-codereview.appspot.com/1195004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3733 4adac7df-926f-26a2-2b94-8c16560cd09d