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

Change-Id: Iabe447a1f7ff3b101bc176a00a470d7776e2629c