Merge "Revert "Add API to query role privileges""