Merge "Check registerPassthroughServiceImplementation ret" am: 592e02c386
am: 8b9f87d793

Change-Id: I8fee32beffb1a4a70a0254f99a5678e350db3a61