Merge "Fix device admin access with permission checks." into udc-dev