Merge "Address URLConnectionTest post-commit review comments"