Merge "URLConnectionTest: add workaround for \r" into nyc-dev