Merge "Update PermissionManager to use NamespaceInfo"