Merge "Migrate PermissionControllerManager to ServiceConnector"