Merge "Make PermissionManager use lists"