am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit 'a46537270ea4d519651157ab5503c02d4b43759d':
  DO NOT MERGE Add a delimiter between scheme and host