Issue #3363538 by arti_parmar, Ashutosh Ahirwal, kenyoOwen: Drupal calls should be avoided in classes, use dependency injection instead