Issue #3293723 by Rakhi Soni: \Drupal calls should be avoided in classes, use dependency injection instead
Closes #3293723