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

Change-Id: Ic98d58505c311250fad7220bec88fcd89846b14e