Merge "Update watchdogd path"