[automerger skipped] Merge "Catch double unbind of dead service" into pi-dev am: 6c2af1af -s ours am: f89a6037 -s ours Change-Id: I2e984e59d7523fb3403a3402d0493bc3e5fba251