DO NOT MERGE Add a delimiter between scheme and host

Bug: 6923539
Change-Id: I219accd5db0c8a0e64b8aab3b049a8cee7dc168f
3 files changed