Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo