Properly handle departed and broken hooks. Change-Id: Iecb1f943ffa5505617b5e5eb70f070458fc6645d Closes-Bug: #1881596