Merge "Fix URL parser may return wrong host name" into nyc-dev am: 7654a2ae01 am: 3ad63f44b3
am: 03fe0acc9a

Change-Id: I87b49015ee55bb857e45e53492515bfe4a928d8a