Merge "Add watchdogd"