Backport consistency watchdog exception handler

Change-Id: Ifaa98b58c006800e62bb6056d282d920efc31898