Merge "Update parcling logic for Uris." into udc-dev