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

Change-Id: I21a32e592317b0286a12cccc77ac42364997bf09