Issue #3368894 by arti_parmar: \Drupal calls should be avoided in classes, use dependency injection instead
