Merge "Check success before registering DeathRecipient" am: b6c4bc31 am: c336947d am: 8e055b13 am: 0e09d9d9 Change-Id: Iabe447a1f7ff3b101bc176a00a470d7776e2629c