Merge "Timeout on socket recv calls after 5secs, retry connection also if...

Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available." into froyo