Merge "Make registerPassthroughClient() synchronous."