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

Change-Id: I44614e83c82ff51be2360e29ee98213987156b0f