Merge "Add watchdog.h"