Merge "Move Watchdog rollback logging to separate class"