Replace drupal_container() with Drupal::service()
Merge remote-tracking branch 'origin/pr/409'