Merge "Fix URL parser may return wrong host name" into nyc-dev