Merge "Update UriTest for changes to toSafeString" into tm-dev