[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev am: 6c2af1afa2  -s ours
am: f89a603753  -s ours

Change-Id: I2e984e59d7523fb3403a3402d0493bc3e5fba251