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

Change-Id: I075c97df642801232c31ebc5828f3096bf3282db