Make registerPassthroughClient() synchronous. am: bf13ad09b7
am: 2b6db0853a

Change-Id: I054284d94bf49c43bc9bad12c96258778ce239f9