Merge "Add @NonNull annotation to CONTENT_URI"