Make registerPassthroughClient() synchronous. am: 737de1b987
am: ae026ac953

Change-Id: I736f857258d7aa31efc0233a63d4ca07e76a5052