Merge "QUERY_USERS is a privileged permission" into udc-dev