Merge "Move Injector impl into separate class." into nyc-andromeda-dev