Add constructor with more inputs for dependency injection.
am: b9df11099f

* commit 'b9df11099f16ca816a69e06f1327eb1f86723578':
  Add constructor with more inputs for dependency injection.