Merge "Make registerPassthroughClient() synchronous." am: 97432db43c am: e2e012593c
am: b991f9e1a0  -s ours

Change-Id: I5dde6bbc387317a4e1ef79a076135c340317f44b