Merge "Check success before registering DeathRecipient" am: b6c4bc311a
am: c336947da4

Change-Id: Ib2b1d0919a974ebe1ce397f643454ae179c1241d