Merge "Catch double unbind of dead service" am: 03cdc95f1c
am: e0d33bc32e

Change-Id: Id994365fa971ecb722d4314b436e2c2bcacf3bf8