Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into tm-dev