(cherry picked from commit 451810e1)
c9388994 [#3527820] Add autowire and autoconfigure to services 19dc3e3e Fix service name b2935c04 Fix autowiring
Co-authored-by: Kim Pepper 22609-kimpepper@users.noreply.drupalcode.org