Ensure that url stripping is done correctly

Change-Id: I9c50674f95ab849e4eaceefd05e3a8e770a86c3a
Closes-Bug: #1284640