DO NOT MERGE Add a delimiter between scheme and host

Bug: 6923539

Change-Id: Ia78e185f00184c53babe00df3c852114ffd721f0
3 files changed