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

Change-Id: Id2616eeff45b7da2eeda0fe83d41dff2db99366a