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

Change-Id: Ibdb36930a57faec3807ed4627bc041f9a5a0f0af