Merge "Check success before registering DeathRecipient"
am: b6c4bc311a

Change-Id: Ie4a8f3ea3374d30a6a4dd9d22d9d48df0075c560