Merge "Check registerPassthroughServiceImplementation ret"
am: 592e02c386

Change-Id: Ia2be3effeba2e128b75ee15b6e15211cb2e122e4