Merge "Fix NPE in UriPermissions." into udc-dev