Merge "Make registerPassthroughClient() synchronous."
am: 97432db43c

Change-Id: I58e2ee20481a5f0143b4f5523185a1eb5230460a