[WJ] code review feedback to set-service autostart.