Make registerPassthroughClient() synchronous. am: af4aba557b
am: a4f019a695

Change-Id: I2d19134acb2e6006059dea9d813c2114e119c285