Merge "Revert "A few permission fixes."" into udc-dev