Add a delimiter between scheme and host

Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
Merge "Add a delimiter between scheme and host" into jb-mr1