Automatic merge from submit-queue (batch tested with PRs 37617, 40197) fix typo in daemon fix typo in daemon.