Merge "Make registerPassthroughClient() synchronous." am: 97432db43c
am: e2e012593c

Change-Id: I95085fb247023ecfd22c88c75a9f8f5c845e23fb