Merge "Allow passthrough service manager to register client PIDs."