Merge "Define reboot.recovery and watchdogd.recovery" into main