Merge "Explicitly set user root for the gs_watchdogd service." into main