Make registerPassthroughClient() synchronous.
am: af4aba557b

Change-Id: I793af982ee109f77fde258eb06eeacc828c53b30