Merge "Fix harmony URLConnectionTest hanging for 25sec."