Merge "Add a Uri class."