DO NOT MERGE Merge commit '8225df00' into bp

Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47